From: adam <adam@megacz.com>
Date: Wed, 14 Apr 2004 08:49:14 +0000 (+0000)
Subject: more uniorm handling of javac
X-Git-Tag: 01-July-2005~163
X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=commitdiff_plain;h=8515ce2bc9fd76876efcb58912e71c5e2aba1910;hp=bcbccfdf9fca3f3970771f9d0ce25d7221e2904e

more uniorm handling of javac

darcs-hash:20040414084914-5007d-f8a96ef669703787a1b7ac5d6519e75fa598fe48.gz
---

diff --git a/Makefile b/Makefile
index 31c65fd..4779d99 100644
--- a/Makefile
+++ b/Makefile
@@ -54,7 +54,6 @@ target_bin_extension_Java2       := jar
 target_bin_extension             := $(target_bin_extension_$(platform))
 target_bin                       := ibex.$(target_bin_extension)
 
-javac   := javac -classpath upstream/bcel-5.1/src/bcel-5.1.jar:build/class -d build/class/ -sourcepath build/java/:upstream/mips:upstream/mips/build:src
 gcc_optimizations  := -Os
 #gcc_optimizations  := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls
 #gcc_optimizations  += -finline-functions -funroll-loops -ffunction-sections -fdata-sections
@@ -69,6 +68,11 @@ g++                := upstream/install/bin/$(target)-gcj $(gcc_flags) -Iupstream
 gcc                := upstream/install/bin/$(target)-gcc $(gcc_flags)
 nm                 := upstream/install/$(target)/bin/nm
 jar                := $(shell ((type fastjar &>/dev/null) && echo fastjar) || echo jar)
+ifeq ($(platform),Java2)
+javac   := javac -classpath upstream/bcel-5.1/src/bcel-5.1.jar   -d build/class/ -sourcepath build/java/
+else
+javac   := $(gcj) -fCLASSPATH=upstream/bcel-5.1/src/bcel-5.1.jar -d build/class/          -Ibuild/java -Iupstream/gnu.regexp-1.1.4/src/src -C
+endif
 
 gcj: .install_gcc-3.3_$(target)
 	@make build/$(platform)/$(target_bin) link_flags="$(link_flags)" platform=$(platform)