Pixel 4: build.config: fix make olddefconfig invocations

Add ${CC_LD_ARG} and remove unnecessary cruft. Change-Id: I0cf3ad5942ef9b7be63e12f056e4b4c9c4362d7f Signed-off-by: Petri Gynther <[email protected]>
theaeonsolution · Aug 13, 2019 · c70e534 · c70e534
1 parent d678237
commit c70e534
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)
 }