working again even better

[org.ibex.core.git] / Makefile

diff --git a/Makefile b/Makefile
index 560042d..f64d42f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -240,7 +240,7 @@ build/$(platform)/$(target_bin): .compile build/$(platform)/builtin.o build/$(pl
        java -cp lib/bcel-5.1.jar:build/class org.ibex.util.BytecodePruner \
                build/$(platform)/ibex.jar:upstream/install/share/java/libgcj-3.3.jar \
                -o build/pruned \
-               `cat .natcalls`
+               `cat .natcalls | grep -v ^gcj` org.ibex.plat.Linux.main
 
 #      rm -rf build/pruned/org/ibex/js/*; cp build/java/org/ibex/js/* build/pruned/org/ibex/js/
 
@@ -258,8 +258,6 @@ build/$(platform)/$(target_bin): .compile build/$(platform)/builtin.o build/$(pl
        rm -rf build/Linux/gnu/java
        rm -rf build/Linux/gnu/classpath
 
-       cp upstream/gcc-3.3/build-$(target)/$(target)/libjava/java/lang/Object.class build/pruned/java/lang/
-
 #      find build/pruned/gnu/java/locale/ -name 'LocaleInformation_*' -not -name 'LocaleInformation_en.class' -not -name 'LocaleInformation_en_US.class' -exec rm {} \;
 
 #      cd build/pruned; fastjar cvf ../../tmp.jar .
@@ -268,6 +266,8 @@ build/$(platform)/$(target_bin): .compile build/$(platform)/builtin.o build/$(pl
 #                              -normex -nobco tmp.jar
 #      cd build/pruned; rm -rf *; fastjar xvf ../../tmp_s.jar
 
+       cp upstream/gcc-3.3/build-$(target)/$(target)/libjava/java/lang/Object.class build/pruned/java/lang/
+
 #                              -fnew-ra \
 #                              -ffunction-sections \
 #                              -fdata-sections \