stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8328079: JDK-8326583 broke ccache compilation

Browse Source 
Reviewed-by: erikj, jwaters
This commit is contained in:
Magnus Ihse Bursie 2024-03-13 14:17:30 +00:00
parent 7e05a70301
commit 4d64467444
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
make/common/NativeCompilation.gmk
View File

@ -303,36 +303,36 @@ endef
# Setup the toolchain variables # Setup the toolchain variables
define SetupToolchain define SetupToolchain
ifeq ($$($1_TARGET_TYPE), BUILD) ifeq ($$($1_TARGET_TYPE), BUILD)
$$(call SetIfEmpty, $1_CC, $(BUILD_CC)) $$(call SetIfEmpty, $1_CC, $$(BUILD_CC))
$$(call SetIfEmpty, $1_CXX, $(BUILD_CXX)) $$(call SetIfEmpty, $1_CXX, $$(BUILD_CXX))
$$(call SetIfEmpty, $1_AR, $(BUILD_AR)) $$(call SetIfEmpty, $1_AR, $$(BUILD_AR))
$$(call SetIfEmpty, $1_LIB, $(BUILD_LIB)) $$(call SetIfEmpty, $1_LIB, $$(BUILD_LIB))
$$(call SetIfEmpty, $1_AS, $(BUILD_AS)) $$(call SetIfEmpty, $1_AS, $$(BUILD_AS))
$$(call SetIfEmpty, $1_OBJCOPY, $(BUILD_OBJCOPY)) $$(call SetIfEmpty, $1_OBJCOPY, $$(BUILD_OBJCOPY))
$$(call SetIfEmpty, $1_STRIP, $(BUILD_STRIP)) $$(call SetIfEmpty, $1_STRIP, $$(BUILD_STRIP))
$$(call SetIfEmpty, $1_SYSROOT_CFLAGS, $(BUILD_SYSROOT_CFLAGS)) $$(call SetIfEmpty, $1_SYSROOT_CFLAGS, $$(BUILD_SYSROOT_CFLAGS))
$$(call SetIfEmpty, $1_SYSROOT_LDFLAGS, $(BUILD_SYSROOT_LDFLAGS)) $$(call SetIfEmpty, $1_SYSROOT_LDFLAGS, $$(BUILD_SYSROOT_LDFLAGS))
ifeq ($$($1_LINK_TYPE), C++) ifeq ($$($1_LINK_TYPE), C++)
$$(call SetIfEmpty, $1_LD, $(BUILD_LDCXX)) $$(call SetIfEmpty, $1_LD, $$(BUILD_LDCXX))
else else
$$(call SetIfEmpty, $1_LD, $(BUILD_LD)) $$(call SetIfEmpty, $1_LD, $$(BUILD_LD))
endif endif
else else
$$(call SetIfEmpty, $1_CC, $(CC)) $$(call SetIfEmpty, $1_CC, $$(CC))
$$(call SetIfEmpty, $1_CXX, $(CXX)) $$(call SetIfEmpty, $1_CXX, $$(CXX))
$$(call SetIfEmpty, $1_AR, $(AR)) $$(call SetIfEmpty, $1_AR, $$(AR))
$$(call SetIfEmpty, $1_LIB, $(LIB)) $$(call SetIfEmpty, $1_LIB, $$(LIB))
$$(call SetIfEmpty, $1_AS, $(AS)) $$(call SetIfEmpty, $1_AS, $$(AS))
$$(call SetIfEmpty, $1_MT, $(MT)) $$(call SetIfEmpty, $1_MT, $$(MT))
$$(call SetIfEmpty, $1_RC, $(RC)) $$(call SetIfEmpty, $1_RC, $$(RC))
$$(call SetIfEmpty, $1_OBJCOPY, $(OBJCOPY)) $$(call SetIfEmpty, $1_OBJCOPY, $$(OBJCOPY))
$$(call SetIfEmpty, $1_STRIP, $(STRIP)) $$(call SetIfEmpty, $1_STRIP, $$(STRIP))
$$(call SetIfEmpty, $1_SYSROOT_CFLAGS, $(SYSROOT_CFLAGS)) $$(call SetIfEmpty, $1_SYSROOT_CFLAGS, $$(SYSROOT_CFLAGS))
$$(call SetIfEmpty, $1_SYSROOT_LDFLAGS, $(SYSROOT_LDFLAGS)) $$(call SetIfEmpty, $1_SYSROOT_LDFLAGS, $$(SYSROOT_LDFLAGS))
ifeq ($$($1_LINK_TYPE), C++) ifeq ($$($1_LINK_TYPE), C++)
$$(call SetIfEmpty, $1_LD, $(LDCXX)) $$(call SetIfEmpty, $1_LD, $$(LDCXX))
else else
$$(call SetIfEmpty, $1_LD, $(LD)) $$(call SetIfEmpty, $1_LD, $$(LD))
endif endif
endif endif
endef endef