darwin linker hack not needed

[org.ibex.core.git] / Makefile

diff --git a/Makefile b/Makefile
index 3b4ea7f..7ad18db 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -48,9 +48,6 @@ darwin_linker_flags += -Wl,-dylib_file,$(darwin_ogl_libdir)/libGL.dylib:$(darwin
 darwin_linker_flags += -Wl,-dylib_file,$(darwin_ogl_libdir):$(darwin_libdir)/libGLU.dylib
 darwin_linker_flags += -lSystem.B -lmathCommon.A -lGL -lGLU
 
-# stupid broke-ass darwin linker...
-darwin_linker_flags += build/Darwin/org/ibex/plat/OpenGL.java.o build/Darwin/org/ibex/plat/POSIX.java.o
-
 target_bin_extension_$(platform) := $(shell echo $(platform) | tr A-Z a-z)
 target_bin_extension_Win32       := exe
 target_bin_extension_Java2       := jar
@@ -70,6 +67,7 @@ gcj                += -foptimize-static-class-initialization -feliminate-dwarf2-
 gcjh               := $(shell pwd)/upstream/install/bin/$(shell test -e upstream/install/bin/$(target)-gcjh && echo $(target)-)gcjh
 g++                := upstream/install/bin/$(target)-gcj $(gcc_flags) -Iupstream/install/include -Wno-multichar
 gcc                := upstream/install/bin/$(target)-gcc $(gcc_flags)
+nm                 := upstream/install/$(target)/bin/nm
 jar                := $(shell ((type fastjar &>/dev/null) && echo fastjar) || echo jar)
 
 gcj: .install_gcc-3.3_$(target)