# HG changeset patch
# User ihse
# Date 1521065729 -3600
# Node ID a7655cb387f9f9f5f3573ce310b3c37e0b155cfd
# Parent  8724d985c980fd4b9e6745373c25179c13be887f
Really fix windows RC problem.

diff -r 8724d985c980 -r a7655cb387f9 make/common/JdkNativeCompilation.gmk
--- a/make/common/JdkNativeCompilation.gmk	Wed Mar 14 21:52:48 2018 +0100
+++ b/make/common/JdkNativeCompilation.gmk	Wed Mar 14 23:15:29 2018 +0100
@@ -191,6 +191,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))
diff -r 8724d985c980 -r a7655cb387f9 make/common/NativeCompilation.gmk
--- a/make/common/NativeCompilation.gmk	Wed Mar 14 21:52:48 2018 +0100
+++ b/make/common/NativeCompilation.gmk	Wed Mar 14 23:15:29 2018 +0100
@@ -746,7 +746,7 @@
 		        $$($1_SYSROOT_CFLAGS) -showIncludes -nologo -TC \
 		        $(CC_OUT_OPTION)$$($1_RES_DEP).obj -P -Fi$$($1_RES_DEP).pp \
 		        $$($1_VERSIONINFO_RESOURCE)) 2>&1 \
-		    | $(GREP) -v -e "^Note: including file:" \
+		    | $(TR) -d '\r' | $(GREP) -v -e "^Note: including file:" \
 		        -e "^$$(notdir $$($1_VERSIONINFO_RESOURCE))$$$$" || test "$$$$?" = "1" ; \
 		$(ECHO) $$($1_RES): \\ > $$($1_RES_DEP) ; \
 		$(SED) $(WINDOWS_SHOWINCLUDE_SED_PATTERN) $$($1_RES_DEP).obj.log >> $$($1_RES_DEP) ; \
diff -r 8724d985c980 -r a7655cb387f9 make/launcher/Launcher-java.base.gmk
--- a/make/launcher/Launcher-java.base.gmk	Wed Mar 14 21:52:48 2018 +0100
+++ b/make/launcher/Launcher-java.base.gmk	Wed Mar 14 23:15:29 2018 +0100
@@ -27,8 +27,8 @@
 
 $(eval $(call IncludeCustomExtension, launcher/Launcher-java.base.gmk))
 
-JAVA_RC_FLAGS += -I $(TOPDIR)/src/java.base/windows/native/common
-JAVA_RC_FLAGS += -I $(TOPDIR)/src/java.base/windows/native/launcher/icons
+JAVA_RC_FLAGS += -I$(TOPDIR)/src/java.base/windows/native/common
+JAVA_RC_FLAGS += -I$(TOPDIR)/src/java.base/windows/native/launcher/icons
 
 ################################################################################
 
diff -r 8724d985c980 -r a7655cb387f9 make/launcher/LauncherCommon.gmk
--- a/make/launcher/LauncherCommon.gmk	Wed Mar 14 21:52:48 2018 +0100
+++ b/make/launcher/LauncherCommon.gmk	Wed Mar 14 23:15:29 2018 +0100
@@ -204,6 +204,7 @@
           $$($1_LIBS_windows), \
       OUTPUT_DIR := $$($1_OUTPUT_DIR), \
       VERSIONINFO_RESOURCE := $$($1_VERSION_INFO_RESOURCE), \
+      EXTRA_RC_FLAGS := $$($1_EXTRA_RC_FLAGS), \
       MANIFEST := $(JAVA_MANIFEST), \
       MANIFEST_VERSION := $(VERSION_NUMBER_FOUR_POSITIONS), \
       CODESIGN := $$($1_CODESIGN), \