Merge "Don't set CC and CXX when running go build on mac" into main
This commit is contained in:
commit
ed0e3cd911
1 changed files with 7 additions and 5 deletions
|
@ -32,11 +32,13 @@ export TMPDIR=${abs_out_dir}/gotemp
|
|||
mkdir -p ${TMPDIR}
|
||||
${GOROOT}/bin/go env
|
||||
|
||||
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
|
||||
|
|
Loading…
Reference in a new issue