OpenJDK / panama / dev
changeset 61316:fc879cfe29ce vectorIntrinsics
8244866: Build of vectorIntrinsics branch fails on Windows
Reviewed-by: psandoz, sviswanathan
| author | srukmannagar |
|---|---|
| date | Thu, 21 May 2020 12:57:08 -0700 |
| parents | aa03f43a58c1 |
| children | 63995d6b2205 |
| files | make/common/NativeCompilation.gmk |
| diffstat | 1 files changed, 12 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/make/common/NativeCompilation.gmk Wed May 20 14:14:25 2020 -0700 +++ b/make/common/NativeCompilation.gmk Thu May 21 12:57:08 2020 -0700 @@ -430,20 +430,20 @@ # on Windows. No need to save exit code from compilation since # pipefail is always active on Windows. ifeq ($$(filter %.s, $$($1_FILENAME)), ) - $$(call ExecuteWithLog, $$@, $$(call MakeCommandRelative, \ - $$($1_COMPILER) -showIncludes $$($1_COMPILE_OPTIONS))) \ - | $(TR) -d '\r' | $(GREP) -v -e "^Note: including file:" \ + $$(call ExecuteWithLog, $$@, $$(call MakeCommandRelative, \ + $$($1_COMPILER) -showIncludes $$($1_COMPILE_OPTIONS))) \ + | $(TR) -d '\r' | $(GREP) -v -e "^Note: including file:" \ -e "^$$($1_FILENAME)$$$$" || test "$$$$?" = "1" ; \ - $(ECHO) $$@: \\ > $$($1_DEPS_FILE) ; \ - $(SED) $(WINDOWS_SHOWINCLUDE_SED_PATTERN) $$($1_OBJ).log \ - | $(SORT) -u >> $$($1_DEPS_FILE) ; \ - $(ECHO) >> $$($1_DEPS_FILE) ; \ - $(SED) $(DEPENDENCY_TARGET_SED_PATTERN) $$($1_DEPS_FILE) > $$($1_DEPS_TARGETS_FILE) + $(ECHO) $$@: \\ > $$($1_DEPS_FILE) ; \ + $(SED) $(WINDOWS_SHOWINCLUDE_SED_PATTERN) $$($1_OBJ).log \ + | $(SORT) -u >> $$($1_DEPS_FILE) ; \ + $(ECHO) >> $$($1_DEPS_FILE) ; \ + $(SED) $(DEPENDENCY_TARGET_SED_PATTERN) $$($1_DEPS_FILE) > $$($1_DEPS_TARGETS_FILE) else - # For assembler calls, no need to build dependency list. - $$(call ExecuteWithLog, $$@, $$(call MakeCommandRelative, \ - $$($1_COMPILER) $$($1_FLAGS) \ - $(CC_OUT_OPTION)$$($1_OBJ) /Ta $$($1_SRC_FILE))) + # For assembler calls, no need to build dependency list. + $$(call ExecuteWithLog, $$@, $$(call MakeCommandRelative, \ + $$($1_COMPILER) $$($1_FLAGS) \ + $(CC_OUT_OPTION)$$($1_OBJ) /Ta $$($1_SRC_FILE))) endif endif endif