X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=Makefile.upstream;h=c5311075076e551e84d582003c87f25aa6a3cdfa;hp=3c53424abd76d28779ded29e7f829500da10e0f8;hb=4abd3e305d0b87f37d5969016b86ba53574a3210;hpb=efda74ffbb674331dbb0b2b1b642073e8edef97e diff --git a/Makefile.upstream b/Makefile.upstream index 3c53424..c531107 100644 --- a/Makefile.upstream +++ b/Makefile.upstream @@ -82,12 +82,14 @@ configure_WindowMaker-0.80.2_$(target) += --host=i686-pc-linux-gnu --x-librarie configure_jode-1.1.1_java := --with-java=$(JAVA_HOME)/bin/java --with-javac=$(JAVA_HOME)/bin/javac ifeq ($(shell uname),Darwin) -environment_jode-1.1.1_java := CLASSLIB=/System/Library/Frameworks/JavaVM.framework/Versions/1.4.1/Classes/classes.jar +environment_jode-1.1.1_java := CLASSLIB=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Classes/classes.jar else environment_jode-1.1.1_java := CLASSLIB=${JAVA_HOME}/jre/lib/rt.jar endif environment_jode-1.1.1_java += CLASSPATH=${CLASSPATH}:$(shell pwd)/upstream/java-getopt-1.0.9/ +#environment_gcc-3.3_i686-pc-linux-gnu += CFLAGS="-Wl,-ldl" + # libjpeg's configury doesn't obey --target environment_jpeg-6b_$(target) += PATH=$(shell pwd)/upstream/install/$(target)/bin:$$PATH environment_jpeg-6b_$(target) += CC=$(shell pwd)/upstream/install/bin/$(target)-gcc