1
0
mirror of https://github.com/apple/foundationdb.git synced 2025-05-31 18:19:35 +08:00

Force Make to push $CC into the environment.

This fixes a long standing weird issue of doing non-docker builds of FDB
can hit problems of $CC not being defined in link-wrapper.sh.  It turns
out that this is because the official docker image defines CC in the
environment, and no one else does that.

Instead, we can just force Make to propagate its setting of CC into the
environment, thus requiring no extra configuration to be able to do a
build.
This commit is contained in:
Alex Miller 2019-02-28 14:50:22 -08:00
parent d08aad7fc4
commit 83629b4d47
2 changed files with 6 additions and 5 deletions

@ -77,6 +77,12 @@ else
CCACHE_CXX := $(CXX)
endif
# Default variables don't get pushed into the environment, but scripts in build/
# rely on the existence of CC in the environment.
ifeq ($(origin CC), default)
CC := $(CC)
endif
ACTORCOMPILER := bin/actorcompiler.exe
# UNSTRIPPED := 1

@ -2,11 +2,6 @@
set -e
if [ -z ${CC+x} ]
then
CC=gcc
fi
case $1 in
Application | DynamicLibrary)
echo "Linking $3"