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.
Try to fix RC_FLAGS issue on windows. ihse-jdk-library-branch
authorihse
Wed, 14 Mar 2018 21:52:48 +0100
branchihse-jdk-library-branch
changeset 56308 8724d985c980
parent 56302 1c7ec9412f91
child 56309 a7655cb387f9
Try to fix RC_FLAGS issue on windows.
make/common/JdkNativeCompilation.gmk file | annotate | diff | comparison | revisions
make/common/NativeCompilation.gmk file | annotate | diff | comparison | revisions
make/launcher/Launcher-java.base.gmk file | annotate | diff | comparison | revisions 
--- a/make/common/JdkNativeCompilation.gmk	Wed Mar 14 12:50:43 2018 +0100
+++ b/make/common/JdkNativeCompilation.gmk	Wed Mar 14 21:52:48 2018 +0100
@@ -107,6 +107,8 @@
     $1_RC_FLAGS :=
   endif
 
+  $1_RC_FLAGS += $$($1_EXTRA_RC_FLAGS)
+
   # Since we reuse the rule name ($1), all our arguments will pass through.
   # We lose in transparency, but gain in brevity in this call...
   $$(eval $$(call SetupNativeCompilation, $1, ))
--- a/make/common/NativeCompilation.gmk	Wed Mar 14 12:50:43 2018 +0100
+++ b/make/common/NativeCompilation.gmk	Wed Mar 14 21:52:48 2018 +0100
@@ -735,7 +735,7 @@
 		$$(call MakeDir, $$(@D) $$($1_OBJECT_DIR))
 		$$(call ExecuteWithLog, $$@, \
 		    $$($1_RC) $$($1_RC_FLAGS) $$($1_SYSROOT_CFLAGS) $(CC_OUT_OPTION)$$@ \
-		    $$($1_VERSIONINFO_RESOURCE))
+		    $$($1_VERSIONINFO_RESOURCE) 2>&1 )
                 # Windows RC compiler does not support -showIncludes, so we mis-use CL
                 # for this. Filter out RC specific arguments that are unknown to CL.
                 # For some unknown reason, in this case CL actually outputs the show
--- a/make/launcher/Launcher-java.base.gmk	Wed Mar 14 12:50:43 2018 +0100
+++ b/make/launcher/Launcher-java.base.gmk	Wed Mar 14 21:52:48 2018 +0100
@@ -39,7 +39,7 @@
     CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS -DENABLE_ARG_FILES, \
     LDFLAGS_solaris := -R$(OPENWIN_HOME)/lib$(OPENJDK_TARGET_CPU_ISADIR), \
     LIBS_windows := user32.lib comctl32.lib, \
-    RC_FLAGS := $(JAVA_RC_FLAGS), \
+    EXTRA_RC_FLAGS := $(JAVA_RC_FLAGS), \
     VERSION_INFO_RESOURCE := $(JAVA_VERSION_INFO_RESOURCE), \
     OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/java_objs, \
     OPTIMIZATION := HIGH, \
@@ -58,7 +58,7 @@
   $(eval $(call SetupBuildLauncher, javaw, \
       CFLAGS := -DJAVAW -DEXPAND_CLASSPATH_WILDCARDS -DENABLE_ARG_FILES, \
       LIBS_windows := user32.lib comctl32.lib, \
-      RC_FLAGS := $(JAVA_RC_FLAGS), \
+      EXTRA_RC_FLAGS := $(JAVA_RC_FLAGS), \
       VERSION_INFO_RESOURCE := $(JAVA_VERSION_INFO_RESOURCE), \
       WINDOWS_STATIC_LINK := true, \
       NO_JAVA_MS := true, \
jdk-sandbox