don't specify -Wl,-rpath argument on Darwin or Windows

It remains to be seen what form that argument should take on those
operating systems; for now, it only causes trouble, so we'll just
leave it out.
This commit is contained in:
Joel Dice 2013-02-12 08:22:21 -07:00
parent dc943c250a
commit d1a7b66085

View File

@ -239,6 +239,8 @@ so-suffix = .so
shared = -shared
rpath = -Wl,-rpath=\$$ORIGIN
no-error = -Wno-error
openjdk-extra-cflags = -fvisibility=hidden
@ -391,6 +393,7 @@ ifeq ($(platform),darwin)
strip-all = -S -x
so-suffix = .dylib
shared = -dynamiclib
rpath =
sdk-dir = $(developer-dir)/Platforms/iPhoneOS.platform/Developer/SDKs
@ -450,6 +453,7 @@ ifeq ($(platform),windows)
so-prefix =
so-suffix = .dll
exe-suffix = .exe
rpath =
lflags = -L$(lib) $(common-lflags) -lws2_32 -liphlpapi -mwindows -mconsole
cflags = -I$(inc) $(common-cflags) -DWINVER=0x0500
@ -1245,7 +1249,7 @@ ifdef msvc
-MANIFESTFILE:$(@).manifest
$(mt) -manifest $(@).manifest -outputresource:"$(@);1"
else
$(ld) $(driver-dynamic-objects) -L$(build) -ljvm $(lflags) $(no-lto) -Wl,-rpath=\$$ORIGIN -z origin -o $(@)
$(ld) $(driver-dynamic-objects) -L$(build) -ljvm $(lflags) $(no-lto) $(rpath) -z origin -o $(@)
endif
$(strip) $(strip-all) $(@)