OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Override all non-default origins for CC/CXX/CPP, not just undefined.

Browse Source
This commit is contained in:
Graydon Hoare 2012-03-28 14:13:00 -07:00
parent 3c398d28a4
commit 45c74f04ab
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mk/platform.mk
View File

@ -204,9 +204,15 @@ endif
CFG_INFO := $(info cfg: using $(CFG_C_COMPILER)) CFG_INFO := $(info cfg: using $(CFG_C_COMPILER))
ifeq ($(CFG_C_COMPILER),clang) ifeq ($(CFG_C_COMPILER),clang)
CC ?= clang ifeq ($(origin CC),default)
CXX ?= clang++ CC=clang
CPP ?= cpp endif
ifeq ($(origin CXX),default)
CXX=clang++
endif
ifeq ($(origin CPP),default)
CPP=cpp
endif
CFG_GCCISH_CFLAGS += -Wall -Werror -fno-rtti -g CFG_GCCISH_CFLAGS += -Wall -Werror -fno-rtti -g
CFG_GCCISH_LINK_FLAGS += -g CFG_GCCISH_LINK_FLAGS += -g
CFG_DEPEND_C = $(CFG_GCCISH_CROSS)$(CXX) $(CFG_GCCISH_CFLAGS) -MT "$(1)" \ CFG_DEPEND_C = $(CFG_GCCISH_CROSS)$(CXX) $(CFG_GCCISH_CFLAGS) -MT "$(1)" \
@ -229,9 +235,15 @@ ifeq ($(CFG_C_COMPILER),clang)
$(eval $(call CFG_MAKE_CC,$(target)))) $(eval $(call CFG_MAKE_CC,$(target))))
else else
ifeq ($(CFG_C_COMPILER),gcc) ifeq ($(CFG_C_COMPILER),gcc)
CC ?= gcc ifeq ($(origin CC),default)
CXX ?= g++ CC=gcc
CPP ?= cpp endif
ifeq ($(origin CXX),default)
CXX=g++
endif
ifeq ($(origin CPP),default)
CPP=cpp
endif
CFG_GCCISH_CFLAGS += -Wall -Werror -fno-rtti -g CFG_GCCISH_CFLAGS += -Wall -Werror -fno-rtti -g
CFG_GCCISH_LINK_FLAGS += -g CFG_GCCISH_LINK_FLAGS += -g
CFG_DEPEND_C = $(CFG_GCCISH_CROSS)$(CXX) $(CFG_GCCISH_CFLAGS) -MT "$(1)" \ CFG_DEPEND_C = $(CFG_GCCISH_CROSS)$(CXX) $(CFG_GCCISH_CFLAGS) -MT "$(1)" \