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

only define soname-flag and version-script-flag for openjdk builds

Browse Source 
These flags are only needed to ensure that libjvm.so can be used as a
drop-in replacement for OpenJDK's VM, and that only makes sense for
openjdk builds (without the openjdk-src option).  It didn't hurt
anything to define them unconditionally, but it was misleading.
This commit is contained in:
Joel Dice 2014-04-11 19:32:16 -06:00
parent f7614bf8a7
commit e5ca66c305
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
makefile
View File

@ -141,6 +141,8 @@ ifneq ($(openjdk),)
stub-sources = $(src)/openjdk/stubs.cpp stub-sources = $(src)/openjdk/stubs.cpp
stub-objects = $(call cpp-objects,$(stub-sources),$(src),$(build)) stub-objects = $(call cpp-objects,$(stub-sources),$(src),$(build))
else else
soname-flag = -Wl,-soname -Wl,$(so-prefix)jvm$(so-suffix)
version-script-flag = -Wl,--version-script=openjdk.ld
options := $(options)-openjdk options := $(options)-openjdk
test-executable = $(shell pwd)/$(executable-dynamic) test-executable = $(shell pwd)/$(executable-dynamic)
ifeq ($(build-platform),darwin) ifeq ($(build-platform),darwin)
@ -191,14 +193,14 @@ ifneq ($(android),)
crypto-native := $(android)/libcore/crypto/src/main/native crypto-native := $(android)/libcore/crypto/src/main/native
crypto-cpps := $(crypto-native)/org_conscrypt_NativeCrypto.cpp crypto-cpps := $(crypto-native)/org_conscrypt_NativeCrypto.cpp
ifeq ($(platform),windows) ifeq ($(platform),windows)
android-cflags += -D__STDC_CONSTANT_MACROS android-cflags += -D__STDC_CONSTANT_MACROS
blacklist = $(luni-native)/java_io_Console.cpp \ blacklist = $(luni-native)/java_io_Console.cpp \
$(luni-native)/java_lang_ProcessManager.cpp \ $(luni-native)/java_lang_ProcessManager.cpp \
$(luni-native)/libcore_net_RawSocket.cpp $(luni-native)/libcore_net_RawSocket.cpp
luni-cpps := $(filter-out $(blacklist),$(luni-cpps)) luni-cpps := $(filter-out $(blacklist),$(luni-cpps))
icu-libs := $(android)/external/icu4c/lib/sicuin.a \ icu-libs := $(android)/external/icu4c/lib/sicuin.a \
$(android)/external/icu4c/lib/sicuuc.a \ $(android)/external/icu4c/lib/sicuuc.a \
@ -366,9 +368,6 @@ 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
build-system = posix build-system = posix
system = posix system = posix
@ -487,10 +486,6 @@ ifeq ($(build-platform),darwin)
build-lflags += -framework CoreFoundation build-lflags += -framework CoreFoundation
endif endif
ifeq ($(platform),darwin)
soname-flag =
endif
ifeq ($(platform),qnx) ifeq ($(platform),qnx)
cflags = $(common-cflags) -fPIC -fvisibility=hidden -I$(src) cflags = $(common-cflags) -fPIC -fvisibility=hidden -I$(src)
lflags = $(common-lflags) -lsocket lflags = $(common-lflags) -lsocket
@ -619,7 +614,7 @@ ifeq ($(platform),darwin)
sysroot = $(sdk-dir)/MacOSX$(mac-version).sdk sysroot = $(sdk-dir)/MacOSX$(mac-version).sdk
endif endif
soname-flag =
version-script-flag = version-script-flag =
lflags = $(common-lflags) -ldl -framework CoreFoundation lflags = $(common-lflags) -ldl -framework CoreFoundation