From cafcf70ca2680fcbcd185144b590eb084e8e9bbe Mon Sep 17 00:00:00 2001 From: megacz Date: Fri, 30 Jan 2004 07:35:41 +0000 Subject: [PATCH] 2003/09/16 21:42:34 darcs-hash:20040130073541-2ba56-c8e0cc18788d19b5883411b8f15dc62cfd424515.gz --- Makefile.upstream | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile.upstream b/Makefile.upstream index 07e3185..e622893 100644 --- a/Makefile.upstream +++ b/Makefile.upstream @@ -57,11 +57,13 @@ url_jikes-1.18 := http://www.megacz.com/tmp/jikes-1.18.tgz #ftp:// # how to configure it configure_gcc-3.3 := --enable-languages=c,c++,java --enable-gc-type=boehm --disable-shared --disable-jvmpi +configure_gcc-3.3-powerpc-apple-darwin := --enable-threads=posix --disable-hash-synchronization --disable-multilib configure_gcc-3.3 += --disable-java-awt --disable-interpreter --enable-static --enable-libgcj +ifneq ($(shell uname),$(platform)) configure_gcc-3.3 += --with-gnu-ld=$(shell pwd)/upstream/install/bin/$(target)-ld configure_gcc-3.3 += --with-as=$(shell pwd)/upstream/install/bin/$(target)-as -configure_gcc-3.3-powerpc-apple-darwin := --enable-threads=posix --disable-hash-synchronization --disable-multilib configure_gcc-3.3-powerpc-apple-darwin += --with-headers=$(shell pwd)/upstream/install/$(target)/include +endif configure_gcc-3.3-i686-pc-mingw32 += --with-headers=$(shell pwd)/upstream/install/$(target)/include configure_gcc-3.3-i686-pc-mingw32 := --enable-threads=win32 --enable-hash-synchronization configure_gcc-3.3-i686-pc-linux-gnu := --enable-threads=posix --enable-hash-synchronization @@ -131,8 +133,8 @@ vendor: .vendor; @true @echo -e "\n\033[1mdetecting your jikes installation...\033[0m" echo "#!/bin/sh" > .jikes echo 'for A in `find build/class -name \*.class`; do mv $$A $$A.old; done;' >> .jikes - echo -n 'PATH=$$PATH:upstream/install/bin/ jikes -classpath lib/libgcj-minimal.jar $$@ -d build/class/ -sourcepath build/java/ ' >> .jikes - (type jikes && (jikes --version | grep "Version 1.18")) || make install_jikes-1.18 + echo -n 'PATH=upstream/install/bin:$$PATH jikes -classpath lib/libgcj-minimal.jar $$@ -d build/class/ -sourcepath build/java/ ' >> .jikes + (type jikes && (jikes --version | grep "Version 1.18")) || make .install_jikes-1.18_ target= echo -n "$(jikes_flags) -bootclasspath " >> .jikes echo "public class GetBootClassPath { public static void main(String[] s) { " > GetBootClassPath.java echo "System.out.println(System.getProperty(\"sun.boot.class.path\")); } }" >> GetBootClassPath.java -- 1.7.10.4