diff --git a/build.config.debug_api b/build.config.debug_api
index b9f0339c4936..dbfa5543ab28 100644
--- a/build.config.debug_api
+++ b/build.config.debug_api
@@ -20,5 +20,5 @@ function update_debug_config() {
          -d CFI_CLANG \
          -d SHADOW_CALL_STACK
     (cd ${OUT_DIR} && \
-     make O=${OUT_DIR} $archsubarch CROSS_COMPILE=${CROSS_COMPILE} olddefconfig)
+     make ${CC_LD_ARG} O=${OUT_DIR} olddefconfig)
 }
diff --git a/build.config.debug_hang b/build.config.debug_hang
index 257f19b71196..973e724288d6 100644
--- a/build.config.debug_hang
+++ b/build.config.debug_hang
@@ -21,5 +21,5 @@ function update_debug_config() {
          -d CFI_CLANG \
          -d SHADOW_CALL_STACK
     (cd ${OUT_DIR} && \
-     make O=${OUT_DIR} $archsubarch CROSS_COMPILE=${CROSS_COMPILE} olddefconfig)
+     make ${CC_LD_ARG} O=${OUT_DIR} olddefconfig)
 }
diff --git a/build.config.debug_locking b/build.config.debug_locking
index f7d41a4f8528..afaf5f025ed4 100644
--- a/build.config.debug_locking
+++ b/build.config.debug_locking
@@ -18,5 +18,5 @@ function update_debug_config() {
          -d CFI_CLANG \
          -d SHADOW_CALL_STACK
     (cd ${OUT_DIR} && \
-     make O=${OUT_DIR} $archsubarch CROSS_COMPILE=${CROSS_COMPILE} olddefconfig)
+     make ${CC_LD_ARG} O=${OUT_DIR} olddefconfig)
 }
diff --git a/build.config.debug_memory b/build.config.debug_memory
index 650b7cb0b1b8..5054eaf82b1c 100644
--- a/build.config.debug_memory
+++ b/build.config.debug_memory
@@ -52,5 +52,5 @@ function update_debug_config() {
          -d CFI_PERMISSIVE \
          -d CFI_CLANG
     (cd ${OUT_DIR} && \
-     make O=${OUT_DIR} $archsubarch CROSS_COMPILE=${CROSS_COMPILE} olddefconfig)
+     make ${CC_LD_ARG} O=${OUT_DIR} olddefconfig)
 }
diff --git a/build.config.gcc b/build.config.gcc
index e5460e323174..cc084512056e 100644
--- a/build.config.gcc
+++ b/build.config.gcc
@@ -13,5 +13,5 @@ function update_gcc_config() {
     -d CFI_CLANG \
     -d SHADOW_CALL_STACK
   (cd ${OUT_DIR} && \
-    make O=${OUT_DIR} $archsubarch CROSS_COMPILE=${CROSS_COMPILE} olddefconfig)
+   make ${CC_LD_ARG} O=${OUT_DIR} olddefconfig)
 }
diff --git a/build.config.kasan b/build.config.kasan
index 9908ad925a5d..4e89857ae64d 100644
--- a/build.config.kasan
+++ b/build.config.kasan
@@ -21,5 +21,5 @@ function update_kasan_config() {
          -d CFI_CLANG \
          -d SHADOW_CALL_STACK
     (cd ${OUT_DIR} && \
-     make O=${OUT_DIR} $archsubarch CROSS_COMPILE=${CROSS_COMPILE} olddefconfig)
+     make ${CC_LD_ARG} O=${OUT_DIR} olddefconfig)
 }
diff --git a/build.config.no-cfi b/build.config.no-cfi
index 0bd76e8067a6..9932e70a2d7d 100644
--- a/build.config.no-cfi
+++ b/build.config.no-cfi
@@ -11,5 +11,5 @@ function update_nocfi_config() {
     -d CFI_PERMISSIVE \
     -d CFI_CLANG
   (cd ${OUT_DIR} && \
-    make O=${OUT_DIR} $archsubarch CROSS_COMPILE=${CROSS_COMPILE} olddefconfig)
+   make ${CC_LD_ARG} O=${OUT_DIR} olddefconfig)
 }
diff --git a/build.config.performance b/build.config.performance
index 95c6ead011ed..63f26ac5e8ba 100644
--- a/build.config.performance
+++ b/build.config.performance
@@ -68,5 +68,5 @@ function update_perf_config() {
 
 
   (cd ${OUT_DIR} && \
-    make O=${OUT_DIR} $archsubarch CROSS_COMPILE=${CROSS_COMPILE} olddefconfig)
+   make ${CC_LD_ARG} O=${OUT_DIR} olddefconfig)
 }