mirror of
https://github.com/corda/corda.git
synced 2025-01-04 04:04:27 +00:00
Add a non-versioned SONAME to Avian libjvm.so that
matches the Hotspot Server/Client libjvm.so SONAME, this allow libjava.so in OpenJDK 7 to find the Avian libjvm.so during ldopen.
This commit is contained in:
parent
24f682f5b6
commit
d88a33329a
4
makefile
4
makefile
@ -223,6 +223,7 @@ build-lflags = -lz -lpthread -ldl
|
|||||||
|
|
||||||
lflags = $(common-lflags) -lpthread -ldl
|
lflags = $(common-lflags) -lpthread -ldl
|
||||||
|
|
||||||
|
soname-flag = -Wl,-soname -Wl,$(so-prefix)jvm$(so-suffix)
|
||||||
version-script-flag = -Wl,--version-script=openjdk.ld
|
version-script-flag = -Wl,--version-script=openjdk.ld
|
||||||
|
|
||||||
build-system = posix
|
build-system = posix
|
||||||
@ -1160,7 +1161,8 @@ ifdef msvc
|
|||||||
-IMPLIB:$(build)/$(name).lib -MANIFESTFILE:$(@).manifest
|
-IMPLIB:$(build)/$(name).lib -MANIFESTFILE:$(@).manifest
|
||||||
$(mt) -manifest $(@).manifest -outputresource:"$(@);2"
|
$(mt) -manifest $(@).manifest -outputresource:"$(@);2"
|
||||||
else
|
else
|
||||||
$(ld) $(^) $(version-script-flag) $(shared) $(lflags) $(bootimage-lflags) \
|
$(ld) $(^) $(version-script-flag) $(soname-flag) \
|
||||||
|
$(shared) $(lflags) $(bootimage-lflags) \
|
||||||
-o $(@)
|
-o $(@)
|
||||||
endif
|
endif
|
||||||
$(strip) $(strip-all) $(@)
|
$(strip) $(strip-all) $(@)
|
||||||
|
Loading…
Reference in New Issue
Block a user