From 7b809a6a92c31063b711d4c8508c53b3b00590dd Mon Sep 17 00:00:00 2001 From: Petri Gynther Date: Mon, 12 Aug 2019 21:10:26 -0700 Subject: [PATCH] Pixel 3: build.config: fix make olddefconfig invocations Add ${CC_LD_ARG} and remove unnecessary cruft. Change-Id: I44fb7ea9a5c20b93a4fa4c5ed4d1d3ad903aba94 Signed-off-by: Petri Gynther --- build.config.bluecross_debug_api | 2 +- build.config.bluecross_debug_hang | 2 +- build.config.bluecross_debug_kmemleak | 2 +- build.config.bluecross_debug_locking | 2 +- build.config.bluecross_debug_memory | 2 +- build.config.bluecross_gcc | 2 +- build.config.bluecross_kasan | 2 +- build.config.bluecross_no-cfi | 2 +- build.config.bonito_debug_api | 2 +- build.config.bonito_debug_hang | 2 +- build.config.bonito_debug_kmemleak | 2 +- build.config.bonito_debug_locking | 2 +- build.config.bonito_debug_memory | 2 +- build.config.bonito_gcc | 2 +- build.config.bonito_kasan | 2 +- build.config.bonito_no-cfi | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/build.config.bluecross_debug_api b/build.config.bluecross_debug_api index 1867c6114f56..3fce0db2736d 100644 --- a/build.config.bluecross_debug_api +++ b/build.config.bluecross_debug_api @@ -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.bluecross_debug_hang b/build.config.bluecross_debug_hang index e6ff4caf06e0..92ea2d80e41b 100644 --- a/build.config.bluecross_debug_hang +++ b/build.config.bluecross_debug_hang @@ -22,5 +22,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.bluecross_debug_kmemleak b/build.config.bluecross_debug_kmemleak index 859fc7f83899..92d033fc2d5d 100644 --- a/build.config.bluecross_debug_kmemleak +++ b/build.config.bluecross_debug_kmemleak @@ -13,5 +13,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.bluecross_debug_locking b/build.config.bluecross_debug_locking index ec91972d00bb..52be6e16f2fd 100644 --- a/build.config.bluecross_debug_locking +++ b/build.config.bluecross_debug_locking @@ -20,5 +20,5 @@ function update_debug_config() { -d SHADOW_CALL_STACK \ -d VMAP_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.bluecross_debug_memory b/build.config.bluecross_debug_memory index 4ecdbafe7c66..65b16a5f4f26 100644 --- a/build.config.bluecross_debug_memory +++ b/build.config.bluecross_debug_memory @@ -54,5 +54,5 @@ function update_debug_config() { -d CFI_CLANG \ -d VMAP_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.bluecross_gcc b/build.config.bluecross_gcc index de8a4442184f..65a7fb17cded 100644 --- a/build.config.bluecross_gcc +++ b/build.config.bluecross_gcc @@ -14,5 +14,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.bluecross_kasan b/build.config.bluecross_kasan index 087ef5a06a88..bcbcb580958f 100644 --- a/build.config.bluecross_kasan +++ b/build.config.bluecross_kasan @@ -22,5 +22,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.bluecross_no-cfi b/build.config.bluecross_no-cfi index 8cad289704b5..65c3ad5632b4 100644 --- a/build.config.bluecross_no-cfi +++ b/build.config.bluecross_no-cfi @@ -12,5 +12,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.bonito_debug_api b/build.config.bonito_debug_api index ac60ca42b82b..ce38e6508559 100644 --- a/build.config.bonito_debug_api +++ b/build.config.bonito_debug_api @@ -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.bonito_debug_hang b/build.config.bonito_debug_hang index e9aeb13eeb3a..d4446150e5d8 100644 --- a/build.config.bonito_debug_hang +++ b/build.config.bonito_debug_hang @@ -22,5 +22,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.bonito_debug_kmemleak b/build.config.bonito_debug_kmemleak index 7c07f23d2ded..58d0cf8ef07c 100644 --- a/build.config.bonito_debug_kmemleak +++ b/build.config.bonito_debug_kmemleak @@ -13,5 +13,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.bonito_debug_locking b/build.config.bonito_debug_locking index 0bb8ea5cd68e..d3f2b44a0dd5 100644 --- a/build.config.bonito_debug_locking +++ b/build.config.bonito_debug_locking @@ -20,5 +20,5 @@ function update_debug_config() { -d SHADOW_CALL_STACK \ -d VMAP_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.bonito_debug_memory b/build.config.bonito_debug_memory index 5de8447b876d..53fcb0e3f2c4 100644 --- a/build.config.bonito_debug_memory +++ b/build.config.bonito_debug_memory @@ -54,5 +54,5 @@ function update_debug_config() { -d CFI_CLANG \ -d VMAP_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.bonito_gcc b/build.config.bonito_gcc index 615dbbfac0da..18daee75424a 100644 --- a/build.config.bonito_gcc +++ b/build.config.bonito_gcc @@ -14,5 +14,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.bonito_kasan b/build.config.bonito_kasan index 60ec1cc545ef..209ab4477367 100644 --- a/build.config.bonito_kasan +++ b/build.config.bonito_kasan @@ -22,5 +22,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.bonito_no-cfi b/build.config.bonito_no-cfi index 9cee4322be27..1acfa5509a7f 100644 --- a/build.config.bonito_no-cfi +++ b/build.config.bonito_no-cfi @@ -12,5 +12,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) }