diff options
author | Elliot Berman <quic_eberman@quicinc.com> | 2022-02-01 13:23:10 -0800 |
---|---|---|
committer | Elliot Berman <quic_eberman@quicinc.com> | 2022-03-14 17:56:15 +0000 |
commit | cc6c1e7a6ef92244016312f53bd4694722ab3c14 (patch) | |
tree | 64e7bd6d7531d1b33ef09ee9df017722a261239a | |
parent | f8ae8a9be8b018ba90a0f576488833fabb3fda74 (diff) | |
download | build-android-gs-raviole-5.10-s-qpr3-beta-3.tar.gz |
_setup_env.sh: Prevent Clang sysroot detection for userprogsandroid-wear-11.0.0_r0.7android-wear-11.0.0_r0.6android-wear-11.0.0_r0.5android-wear-11.0.0_r0.4android-wear-11.0.0_r0.3android-wear-11.0.0_r0.2android-wear-11.0.0_r0.1android-u-preview-1_r0.1android-t-qpr2-beta-3_r0.2android-t-qpr2-beta-3.2_r0.3android-t-qpr2-beta-2_r0.2android-t-qpr2-beta-1_r0.3android-t-qpr1-beta-3_r0.1android-t-qpr1-beta-2_r0.3android-t-qpr1-beta-1_r0.2android-t-beta-4_r0.3android-t-beta-3_r0.3android-t-beta-3.3_r0.3android-t-beta-3.2_r0.3android-t-beta-2_r0.3android-s-qpr3-beta-3_r0.5android-s-qpr3-beta-3_r0.4android-s-qpr3-beta-3_r0.3android-s-qpr3-beta-2_r0.5android-13.0.0_r0.62android-13.0.0_r0.57android-13.0.0_r0.52android-13.0.0_r0.47android-13.0.0_r0.42android-13.0.0_r0.3android-13.0.0_r0.18android-13.0.0_r0.13android-12.1.0_r0.40android-12.1.0_r0.35android-12.1.0_r0.34android-12.1.0_r0.33android-12.1.0_r0.28android-12.1.0_r0.27android-12.1.0_r0.26android-msm-redbull-4.19-u-preview-1android-msm-redbull-4.19-t-qpr2-beta-3.2android-msm-redbull-4.19-t-qpr2-beta-1android-msm-redbull-4.19-t-qpr1-beta-2android-msm-redbull-4.19-t-beta-4android-msm-redbull-4.19-t-beta-3android-msm-redbull-4.19-t-beta-2android-msm-redbull-4.19-s-qpr3-beta-3android-msm-redbull-4.19-android13-qpr2-betaandroid-msm-redbull-4.19-android13-qpr1-beta-3android-msm-redbull-4.19-android13-qpr1-betaandroid-msm-redbull-4.19-android13-qpr1android-msm-redbull-4.19-android13android-msm-redbull-4.19-android12-qpr3android-msm-barbet-4.19-s-qpr3-beta-3android-msm-barbet-4.19-android12-qpr3android-gs-raviole-5.10-s-qpr3-beta-3android-gs-raviole-5.10-s-qpr3-beta-2android-gs-raviole-5.10-android12-qpr3android-gs-bluejay-5.10-android12L-d2android-exynos-r11-4.19-android11-wear-jr2
Prevent Clang sysroot detection for userprogs by specifying a path known
not to contain a sysroot.
See also: https://lore.kernel.org/linux-kbuild/20220112224342.958358-1-quic_eberman@quicinc.com/
Test: Compare .config from BUILD_CONFIG=common/build.config.gki.aarch64 ./build/build.sh
Bug: 214127735
Signed-off-by: Elliot Berman <quic_eberman@quicinc.com>
Change-Id: I8c23755c3d5d1c7ef12de642659afdcfb3c1e380
(cherry picked from commit e5f575376c3abcbc0cafe58746407af68b976c49)
-rw-r--r-- | _setup_env.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/_setup_env.sh b/_setup_env.sh index b34f1b9..d7669e0 100644 --- a/_setup_env.sh +++ b/_setup_env.sh @@ -127,6 +127,8 @@ if [ "${HERMETIC_TOOLCHAIN:-0}" -eq 1 ]; then export HOSTCFLAGS="$sysroot_flags $cflags" export HOSTLDFLAGS="$sysroot_flags $ldflags" + + export USERCFLAGS="--sysroot=/dev/null" fi for PREBUILT_BIN in "${PREBUILTS_PATHS[@]}"; do |