Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clean up last macosx libs. ihse-jdk-library-branch
authorihse
Thu, 19 Apr 2018 14:38:22 +0200
branchihse-jdk-library-branch
changeset 56459 4615f8554122
parent 56457 0ec7d7abf529
child 56460 9e91ecb7e61b
Clean up last macosx libs.
make/lib/Lib-java.base.gmk file | annotate | diff | comparison | revisions
make/lib/Lib-java.desktop.gmk file | annotate | diff | comparison | revisions
make/lib/Lib-java.security.jgss.gmk file | annotate | diff | comparison | revisions 
--- a/make/lib/Lib-java.base.gmk	Thu Apr 19 14:15:19 2018 +0200
+++ b/make/lib/Lib-java.base.gmk	Thu Apr 19 14:38:22 2018 +0200
@@ -109,8 +109,8 @@
         NAME := osxsecurity, \
         OPTIMIZATION := LOW, \
         CFLAGS := $(CFLAGS_JDKLIB), \
-        HEADER_FLAGS :=  \
-            -I$(SUPPORT_OUTPUTDIR)/headers/java.base, \
+        HEADER_FLAGS := \
+            -I$(call FindHeaderDirForModule, $(MODULE)), \
         DISABLED_WARNINGS_clang := deprecated-declarations, \
         LDFLAGS := $(LDFLAGS_JDKLIB) \
             -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.base \
--- a/make/lib/Lib-java.desktop.gmk	Thu Apr 19 14:15:19 2018 +0200
+++ b/make/lib/Lib-java.desktop.gmk	Thu Apr 19 14:38:22 2018 +0200
@@ -88,11 +88,13 @@
 # Create the macosx specific osxapp and osx libraries
 
 ifeq ($(OPENJDK_TARGET_OS), macosx)
+
   $(eval $(call SetupJdkLibrary, BUILD_LIBOSXAPP, \
       NAME := osxapp, \
       OPTIMIZATION := LOW, \
       CFLAGS := $(CFLAGS_JDKLIB), \
-      HEADER_FLAGS := -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \
+      HEADER_FLAGS := \
+          -I$(call FindHeaderDirForModule, $(MODULE)), \
       DISABLED_WARNINGS_clang := objc-method-access objc-root-class \
           deprecated-declarations, \
       LDFLAGS := $(LDFLAGS_JDKLIB) \
@@ -121,8 +123,8 @@
       OPTIMIZATION := LOW, \
       CFLAGS := $(CFLAGS_JDKLIB), \
       HEADER_FLAGS := \
-          -I$(TOPDIR)/src/java.desktop/macosx/native/libosxapp \
-          -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \
+          -I$(call FindHeaderDirForModule, $(MODULE)) \
+          $(addprefix -I, $(call FindSrcDirsForLib, java.desktop, osxapp)), \
       DISABLED_WARNINGS_clang := deprecated-declarations, \
       LDFLAGS := $(LDFLAGS_JDKLIB) \
           -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.desktop \
--- a/make/lib/Lib-java.security.jgss.gmk	Thu Apr 19 14:15:19 2018 +0200
+++ b/make/lib/Lib-java.security.jgss.gmk	Thu Apr 19 14:38:22 2018 +0200
@@ -69,7 +69,7 @@
         OPTIMIZATION := LOW, \
         CFLAGS := $(CFLAGS_JDKLIB), \
         HEADER_FLAGS := \
-            -I$(SUPPORT_OUTPUTDIR)/headers/java.security.jgss, \
+            -I$(call FindHeaderDirForModule, $(MODULE)), \
         DISABLED_WARNINGS_clang := deprecated-declarations, \
         LDFLAGS := $(LDFLAGS_JDKLIB) \
             $(call SET_SHARED_LIBRARY_ORIGIN), \
jdk-sandbox