make/common/NativeCompilation.gmk

*** 649,664 ****
        $1_RES_VARDEPS_FILE := $$(call DependOnVariable, $1_RES_VARDEPS, \
            $$($1_RES).vardeps)
  
        $$($1_RES): $$($1_VERSIONINFO_RESOURCE) $$($1_RES_VARDEPS_FILE)
                  $$(call LogInfo, Compiling resource $$(notdir $$($1_VERSIONINFO_RESOURCE)) (for $$(notdir $$($1_TARGET))))
                  $$(call ExecuteWithLog, $$@, \
                      $$($1_RC) $$($1_RC_FLAGS) $$($1_SYSROOT_CFLAGS) $(CC_OUT_OPTION)$$@ \
                      $$($1_VERSIONINFO_RESOURCE))
                  # Windows RC compiler does not support -showIncludes, so we mis-use CL for this.
                  $$($1_CC) $$($1_RC_FLAGS) $$($1_SYSROOT_CFLAGS) -showIncludes -nologo -TC \
!                     $(CC_OUT_OPTION)$$($1_RES_DEP).obj $$($1_VERSIONINFO_RESOURCE) > $$($1_RES_DEP).raw 2>&1 || true ; \
                  $(ECHO) $$($1_RES): \\ > $$($1_RES_DEP) ; \
                  $(SED) $(WINDOWS_SHOWINCLUDE_SED_PATTERN) $$($1_RES_DEP).raw >> $$($1_RES_DEP) ; \
                  $(SED) $(DEPENDENCY_TARGET_SED_PATTERN) $$($1_RES_DEP) > $$($1_RES_DEP_TARGETS)
      endif
    endif
--- 649,667 ----
        $1_RES_VARDEPS_FILE := $$(call DependOnVariable, $1_RES_VARDEPS, \
            $$($1_RES).vardeps)
  
        $$($1_RES): $$($1_VERSIONINFO_RESOURCE) $$($1_RES_VARDEPS_FILE)
                  $$(call LogInfo, Compiling resource $$(notdir $$($1_VERSIONINFO_RESOURCE)) (for $$(notdir $$($1_TARGET))))
+                 $$(call MakeDir, $$(@D) $$($1_OBJECT_DIR))
                  $$(call ExecuteWithLog, $$@, \
                      $$($1_RC) $$($1_RC_FLAGS) $$($1_SYSROOT_CFLAGS) $(CC_OUT_OPTION)$$@ \
                      $$($1_VERSIONINFO_RESOURCE))
                  # Windows RC compiler does not support -showIncludes, so we mis-use CL for this.
+                 $$(call ExecuteWithLog, $$($1_RES_DEP).obj, \
                      $$($1_CC) $$($1_RC_FLAGS) $$($1_SYSROOT_CFLAGS) -showIncludes -nologo -TC \
!                     $(CC_OUT_OPTION)$$($1_RES_DEP).obj -P -Fi$$($1_RES_DEP).pp \
!                     $$($1_VERSIONINFO_RESOURCE)) > $$($1_RES_DEP).raw 2>&1 || true ; \
                  $(ECHO) $$($1_RES): \\ > $$($1_RES_DEP) ; \
                  $(SED) $(WINDOWS_SHOWINCLUDE_SED_PATTERN) $$($1_RES_DEP).raw >> $$($1_RES_DEP) ; \
                  $(SED) $(DEPENDENCY_TARGET_SED_PATTERN) $$($1_RES_DEP) > $$($1_RES_DEP_TARGETS)
      endif
    endif
*** 668,678 ****
      ifneq ($(OPENJDK_TARGET_OS),windows)
        ifneq (,$$($1_REORDER))
          $1_REAL_MAPFILE := $$($1_OBJECT_DIR)/mapfile
  
          $$($1_REAL_MAPFILE) : $$($1_MAPFILE) $$($1_REORDER)
!                 $$(MKDIR) -p $$(@D)
                  $$(CP) $$($1_MAPFILE) $$@.tmp
                  $$(SED) -e 's=OUTPUTDIR=$$($1_OBJECT_DIR)=' $$($1_REORDER) >> $$@.tmp
                  $$(MV) $$@.tmp $$@
        endif
      endif
--- 671,681 ----
      ifneq ($(OPENJDK_TARGET_OS),windows)
        ifneq (,$$($1_REORDER))
          $1_REAL_MAPFILE := $$($1_OBJECT_DIR)/mapfile
  
          $$($1_REAL_MAPFILE) : $$($1_MAPFILE) $$($1_REORDER)
!                 $$(call MakeDir, $$(@D))
                  $$(CP) $$($1_MAPFILE) $$@.tmp
                  $$(SED) -e 's=OUTPUTDIR=$$($1_OBJECT_DIR)=' $$($1_REORDER) >> $$@.tmp
                  $$(MV) $$@.tmp $$@
        endif
      endif