changeset 45462:0de8011890c0

8173654: Regression since 8u60: System.getenv doesn't return env var set in JNI code Reviewed-by: erikj
author robm
date Fri, 09 Jun 2017 16:26:32 +0100
parents 8b6f0a3850ab
children d9325138bac6
files jdk/make/lib/CoreLibraries.gmk
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/jdk/make/lib/CoreLibraries.gmk	Thu Jun 08 12:15:54 2017 +0530
+++ b/jdk/make/lib/CoreLibraries.gmk	Fri Jun 09 16:26:32 2017 +0100
@@ -132,7 +132,8 @@
 
 ##########################################################################################
 
-LIBJAVA_SRC_DIRS := $(call FindSrcDirsForLib, java.base, java)
+# Allow a custom makefile to add extra src dirs
+LIBJAVA_SRC_DIRS += $(call FindSrcDirsForLib, java.base, java)
 
 LIBJAVA_CFLAGS := $(addprefix -I, $(LIBJAVA_SRC_DIRS)) \
     -I$(JDK_TOPDIR)/src/java.base/share/native/libfdlibm \