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

This commit is contained in:
Treehugger Robot 2024-01-19 22:20:04 +00:00 committed by Gerrit Code Review
commit ed0e3cd911

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