From 38a4a307e2c630205b5bd04508371fce71cdf290 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Thu, 11 Oct 2018 01:15:33 -0700 Subject: [PATCH] scripts/build/osx: set CXX, too In case go build will see a need to call C++ (rather than C) compiler, CXX env var need to be properly set (to osxcross wrapper). Signed-off-by: Kir Kolyshkin (cherry picked from commit ee461303f9e74937a0a598650249f4331b1dd498) Signed-off-by: Sebastiaan van Stijn Upstream-commit: f9a42a40244c18659d2c20cc6301b79290bbd9af Component: cli --- components/cli/scripts/build/osx | 1 + 1 file changed, 1 insertion(+) diff --git a/components/cli/scripts/build/osx b/components/cli/scripts/build/osx index a5e7d9432c..a075ede412 100755 --- a/components/cli/scripts/build/osx +++ b/components/cli/scripts/build/osx @@ -11,6 +11,7 @@ export CGO_ENABLED=1 export GOOS=darwin export GOARCH=amd64 export CC=o64-clang +export CXX=o64-clang++ export LDFLAGS="$LDFLAGS -linkmode external -s" export LDFLAGS_STATIC_DOCKER='-extld='${CC}