8328079: JDK-8326583 broke ccache compilation

Reviewed-by: erikj, jwaters
openjdk · Mar 13, 2024 · 4d64467 · 4d64467 · openjdk-notifier · Mar 13, 2024
1 parent 7e05a70
commit 4d64467
Showing 1 changed file with 24 additions and 24 deletions.
diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk
@@ -303,36 +303,36 @@ endef
 # Setup the toolchain variables
 define SetupToolchain
   ifeq ($$($1_TARGET_TYPE), BUILD)
-    $$(call SetIfEmpty, $1_CC, $(BUILD_CC))
-    $$(call SetIfEmpty, $1_CXX, $(BUILD_CXX))
-    $$(call SetIfEmpty, $1_AR, $(BUILD_AR))
-    $$(call SetIfEmpty, $1_LIB, $(BUILD_LIB))
-    $$(call SetIfEmpty, $1_AS, $(BUILD_AS))
-    $$(call SetIfEmpty, $1_OBJCOPY, $(BUILD_OBJCOPY))
-    $$(call SetIfEmpty, $1_STRIP, $(BUILD_STRIP))
-    $$(call SetIfEmpty, $1_SYSROOT_CFLAGS, $(BUILD_SYSROOT_CFLAGS))
-    $$(call SetIfEmpty, $1_SYSROOT_LDFLAGS, $(BUILD_SYSROOT_LDFLAGS))
+    $$(call SetIfEmpty, $1_CC, $$(BUILD_CC))
+    $$(call SetIfEmpty, $1_CXX, $$(BUILD_CXX))
+    $$(call SetIfEmpty, $1_AR, $$(BUILD_AR))
+    $$(call SetIfEmpty, $1_LIB, $$(BUILD_LIB))
+    $$(call SetIfEmpty, $1_AS, $$(BUILD_AS))
+    $$(call SetIfEmpty, $1_OBJCOPY, $$(BUILD_OBJCOPY))
+    $$(call SetIfEmpty, $1_STRIP, $$(BUILD_STRIP))
+    $$(call SetIfEmpty, $1_SYSROOT_CFLAGS, $$(BUILD_SYSROOT_CFLAGS))
+    $$(call SetIfEmpty, $1_SYSROOT_LDFLAGS, $$(BUILD_SYSROOT_LDFLAGS))
     ifeq ($$($1_LINK_TYPE), C++)
-      $$(call SetIfEmpty, $1_LD, $(BUILD_LDCXX))
+      $$(call SetIfEmpty, $1_LD, $$(BUILD_LDCXX))
     else
-      $$(call SetIfEmpty, $1_LD, $(BUILD_LD))
+      $$(call SetIfEmpty, $1_LD, $$(BUILD_LD))
     endif
   else
-    $$(call SetIfEmpty, $1_CC, $(CC))
-    $$(call SetIfEmpty, $1_CXX, $(CXX))
-    $$(call SetIfEmpty, $1_AR, $(AR))
-    $$(call SetIfEmpty, $1_LIB, $(LIB))
-    $$(call SetIfEmpty, $1_AS, $(AS))
-    $$(call SetIfEmpty, $1_MT, $(MT))
-    $$(call SetIfEmpty, $1_RC, $(RC))
-    $$(call SetIfEmpty, $1_OBJCOPY, $(OBJCOPY))
-    $$(call SetIfEmpty, $1_STRIP, $(STRIP))
-    $$(call SetIfEmpty, $1_SYSROOT_CFLAGS, $(SYSROOT_CFLAGS))
-    $$(call SetIfEmpty, $1_SYSROOT_LDFLAGS, $(SYSROOT_LDFLAGS))
+    $$(call SetIfEmpty, $1_CC, $$(CC))
+    $$(call SetIfEmpty, $1_CXX, $$(CXX))
+    $$(call SetIfEmpty, $1_AR, $$(AR))
+    $$(call SetIfEmpty, $1_LIB, $$(LIB))
+    $$(call SetIfEmpty, $1_AS, $$(AS))
+    $$(call SetIfEmpty, $1_MT, $$(MT))
+    $$(call SetIfEmpty, $1_RC, $$(RC))
+    $$(call SetIfEmpty, $1_OBJCOPY, $$(OBJCOPY))
+    $$(call SetIfEmpty, $1_STRIP, $$(STRIP))
+    $$(call SetIfEmpty, $1_SYSROOT_CFLAGS, $$(SYSROOT_CFLAGS))
+    $$(call SetIfEmpty, $1_SYSROOT_LDFLAGS, $$(SYSROOT_LDFLAGS))
     ifeq ($$($1_LINK_TYPE), C++)
-      $$(call SetIfEmpty, $1_LD, $(LDCXX))
+      $$(call SetIfEmpty, $1_LD, $$(LDCXX))
     else
-      $$(call SetIfEmpty, $1_LD, $(LD))
+      $$(call SetIfEmpty, $1_LD, $$(LD))
     endif
   endif
 endef