Skip to content

Commit 5298acc

Browse files
committed
Don't use gcc on macOS
1 parent 9c824ce commit 5298acc

File tree

2 files changed

+21
-17
lines changed

2 files changed

+21
-17
lines changed

.evergreen/install-node-source.sh

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,19 @@ else
1515
echo "[INFO] Choosing v3 because OS_ARCH is $OS_ARCH"
1616
export TOOLCHAIN_PATH='/opt/mongodbtoolchain/v3/bin'
1717
fi
18-
export PATH="$TOOLCHAIN_PATH:/opt/mongodbtoolchain/v4/bin:/opt/mongodbtoolchain/v3/bin:${ORIGINAL_PATH}"
18+
export PATH="$TOOLCHAIN_PATH:${ORIGINAL_PATH}"
1919

20-
export PATH="/opt/mongodbtoolchain/v4/bin:/opt/mongodbtoolchain/v3/bin:${ORIGINAL_PATH}"
21-
export CC=gcc
22-
export CXX=g++
20+
21+
if [ `uname` != Darwin ]; then
22+
export CC=gcc
23+
export CXX=g++
24+
25+
echo "Using gcc version:"
26+
(which gcc && gcc --version)
27+
28+
echo "Using g++ version:"
29+
(which g++ && g++ --version)
30+
fi
2331

2432
NODE_JS_TARBALL_FILE="node-v${NODE_JS_VERSION}.tar.gz"
2533
NODE_JS_TARBALL_PATH="${EVGDIR}/${NODE_JS_TARBALL_FILE}"
@@ -29,12 +37,6 @@ NODE_JS_SOURCE_PATH="${EVGDIR}/node-v${NODE_JS_VERSION}"
2937
# scripts to simply do `nvm use`
3038
NODE_JS_INSTALL_DIR="${NVM_DIR}/versions/node/v${NODE_JS_VERSION}"
3139

32-
echo "Using gcc version:"
33-
(which gcc && gcc --version)
34-
35-
echo "Using g++ version:"
36-
(which g++ && g++ --version)
37-
3840
echo "Using python3 version:"
3941
(which python3 && python3 --version) || true
4042

.evergreen/setup-env.sh

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ set -e
22
set -x
33

44
OS_ARCH="$(uname "-m")"
5-
if [ "$OS_ARCH" = "ppc64le" ] || [ "$OS_ARCH" = "ppc64" ] || [ "$OS_ARCH" = "arm64" ]; then
5+
if [ "$OS_ARCH" = "ppc64le" ] || [ "$OS_ARCH" = "ppc64" ]; then
66
echo "[INFO] Choosing v4 because OS_ARCH is $OS_ARCH"
77
export TOOLCHAIN_PATH='/opt/mongodbtoolchain/v4/bin'
88
else
@@ -38,14 +38,16 @@ if [ "$OS" != "Windows_NT" ]; then
3838
set -x
3939
export PATH="$NVM_BIN:$PATH"
4040

41-
export CC=gcc
42-
export CXX=g++
41+
if [ `uname` != Darwin ]; then
42+
export CC=gcc
43+
export CXX=g++
4344

44-
echo "Using gcc version:"
45-
(which gcc && gcc --version)
45+
echo "Using gcc version:"
46+
(which gcc && gcc --version)
4647

47-
echo "Using g++ version:"
48-
(which g++ && g++ --version)
48+
echo "Using g++ version:"
49+
(which g++ && g++ --version)
50+
fi
4951

5052
if [ -x "$BASEDIR/git-2/git" ]; then
5153
export GIT_EXEC_PATH="$BASEDIR/git-2"

0 commit comments

Comments
 (0)