ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-06 05:04:20 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

don't specify -Wl,-rpath argument on Darwin or Windows (take 2)

Browse Source
This commit is contained in:
Joel Dice 2013-02-12 09:27:47 -07:00
parent 8a7b6488d4
commit 937343d0d3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
makefile
View File

@ -267,7 +267,7 @@ build-ld = $(build-cc)
static = -static static = -static
shared = -shared shared = -shared
rpath = -Wl,-rpath=\$$ORIGIN rpath = -Wl,-rpath=\$$ORIGIN -Wl,-z,origin
no-error = -Wno-error no-error = -Wno-error
@ -1573,7 +1573,7 @@ ifdef mt
$(mt) -nologo -manifest $(@).manifest -outputresource:"$(@);1" $(mt) -nologo -manifest $(@).manifest -outputresource:"$(@);1"
endif endif
else else
$(ld) $(driver-dynamic-objects) -L$(build) -ljvm $(lflags) $(no-lto) $(rpath) -z origin -o $(@) $(ld) $(driver-dynamic-objects) -L$(build) -ljvm $(lflags) $(no-lto) $(rpath) -o $(@)
endif endif
$(strip) $(strip-all) $(@) $(strip) $(strip-all) $(@)