tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't set CC and CXX when running go build on mac

Browse source 
Setting CC and CXX to point to our clang prebuilts on mac fails to build with:
_cgo_export.c:3:10: fatal error: 'stdlib.h' file not found

Skip setting CC and CXX on mac to go back to using the host linker.

Change-Id: I9bab4cda961874c381eacc34397cc67f62fd4730
Test: treehugger
This commit is contained in:
Colin Cross 2024-01-19 19:32:54 +00:00
parent 169cffe526
commit 84caaef55c
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/run-soong-tests-with-go-tools.sh
View file

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