diff options
| author | robm <none@none> | 2017-06-10 02:07:36 +0300 |
|---|---|---|
| committer | Alexey Ushakov <Alexey.Ushakov@jetbrains.com> | 2017-06-14 11:28:30 +0300 |
| commit | 173c875511069a5e0b0bf5c7ba8f6b3a8a4bdc54 (patch) | |
| tree | 418c492c617db8a5492561c4a57ce1ffd6f06c69 /make | |
| parent | 4983da07ad54d774e2ab7e8654dae6d73705efb6 (diff) | |
| download | jdk8u_jdk-173c875511069a5e0b0bf5c7ba8f6b3a8a4bdc54.tar.gz | |
8173654: Regression since 8u60: System.getenv doesn't return env var set in JNI codejb8u152-b928
Reviewed-by: erikj
(cherry picked from commit be89d8b)
Diffstat (limited to 'make')
| -rw-r--r-- | make/lib/CoreLibraries.gmk | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/make/lib/CoreLibraries.gmk b/make/lib/CoreLibraries.gmk index 389e6b922e..b8f1d67cbf 100644 --- a/make/lib/CoreLibraries.gmk +++ b/make/lib/CoreLibraries.gmk @@ -23,6 +23,9 @@ # questions. # +# Include custom extensions if available. +-include $(CUSTOM_MAKE_DIR)/lib/CoreLibraries.gmk + WIN_VERIFY_LIB := $(JDK_OUTPUTDIR)/objs/libverify/verify.lib ########################################################################################## @@ -129,7 +132,8 @@ BUILD_LIBRARIES += $(BUILD_LIBVERIFY) ########################################################################################## -LIBJAVA_SRC_DIRS := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/lang \ +# Allow a custom makefile to add extra src dirs +LIBJAVA_SRC_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/lang \ $(JDK_TOPDIR)/src/share/native/java/lang \ $(JDK_TOPDIR)/src/share/native/java/lang/reflect \ $(JDK_TOPDIR)/src/share/native/java/io \ @@ -155,6 +159,9 @@ ifeq ($(OPENJDK_TARGET_OS), windows) $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/io endif +# Make it possible to override this variable +LIBJAVA_MAPFILE ?= $(JDK_TOPDIR)/make/mapfiles/libjava/mapfile-vers + LIBJAVA_CFLAGS := $(foreach dir, $(LIBJAVA_SRC_DIRS), -I$(dir)) \ -I$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/include \ -DARCHPROPNAME='"$(OPENJDK_TARGET_CPU_OSARCH)"' @@ -208,7 +215,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJAVA, \ OPTIMIZATION := HIGH, \ CFLAGS := $(CFLAGS_JDKLIB) \ $(LIBJAVA_CFLAGS), \ - MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjava/mapfile-vers, \ + MAPFILE := $(LIBJAVA_MAPFILE), \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ LDFLAGS_SUFFIX_posix := -ljvm -lverify, \ |