Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84caaef5 authored by Colin Cross's avatar Colin Cross
Browse files

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

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
parent 169cffe5

scripts/run-soong-tests-with-go-tools.sh

+7 −5
Original line number Diff line number Diff line
@@ -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