StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't set CC and CXX when running go build on mac" into main am: ed0e3cd911

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2920306

Change-Id: I4f900118e77506f2f250797fa9e7afaa02b44f4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-01-19 22:32:56 +00:00
committed by Automerger Merge Worker
parent 287d753573 ed0e3cd911
commit d6e390c604
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/run-soong-tests-with-go-tools.sh
View File

@@ -32,11 +32,13 @@ export TMPDIR=${abs_out_dir}/gotemp
mkdir -p ${TMPDIR}
${GOROOT}/bin/go env
# Building with the race detector enabled uses the host linker, set the
# path to use the hermetic one.
CLANG_VERSION=$(build/soong/scripts/get_clang_version.py)
export CC="${TOP}/prebuilts/clang/host/${OS}-x86/${CLANG_VERSION}/bin/clang"
export CXX="${TOP}/prebuilts/clang/host/${OS}-x86/${CLANG_VERSION}/bin/clang++"
if [[ ${OS} = linux ]]; then
# Building with the race detector enabled uses the host linker, set the
# path to use the hermetic one.
CLANG_VERSION=$(build/soong/scripts/get_clang_version.py)
export CC="${TOP}/prebuilts/clang/host/${OS}-x86/${CLANG_VERSION}/bin/clang"
export CXX="${TOP}/prebuilts/clang/host/${OS}-x86/${CLANG_VERSION}/bin/clang++"
fi
# androidmk_test.go gets confused if ANDROID_BUILD_TOP is set.
unset ANDROID_BUILD_TOP