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

Commit ed0e3cd9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents 1fb7d7d5 84caaef5

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