mirror of
https://github.com/corda/corda.git
synced 2025-03-17 17:45:17 +00:00
use rpath=$ORIGIN instead of LD_LIBRARY_PATH
Hi If libjvm.so is in the same directory as avian-dynamic, then there's no need for LD_LIBRARY_PATH to include that directory, we can just set the rpath in avian-dynamic to $ORIGIN when linking it. Working patch attached. Regards Damjan
This commit is contained in:
parent
f9b3be0301
commit
07e3294937
2
makefile
2
makefile
@ -1245,7 +1245,7 @@ ifdef msvc
|
||||
-MANIFESTFILE:$(@).manifest
|
||||
$(mt) -manifest $(@).manifest -outputresource:"$(@);1"
|
||||
else
|
||||
$(ld) $(driver-dynamic-objects) -L$(build) -ljvm $(lflags) $(no-lto) -o $(@)
|
||||
$(ld) $(driver-dynamic-objects) -L$(build) -ljvm $(lflags) $(no-lto) -Wl,-rpath=\$$ORIGIN -z origin -o $(@)
|
||||
endif
|
||||
$(strip) $(strip-all) $(@)
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user