Skip to content
Snippets Groups Projects
Commit fe52b37d authored by deuce's avatar deuce
Browse files

Remove the DONT_CLOBBER_CC option, don't clobber CC, and detect the name

of the compiler (icc, gcc, and clang supported).
parent 7450894d
No related branches found
No related tags found
No related merge requests found
...@@ -57,7 +57,6 @@ ...@@ -57,7 +57,6 @@
# is cleared) # # is cleared) #
# USE_UPROFILE - Builds using information generated by UPROFILE. # # USE_UPROFILE - Builds using information generated by UPROFILE. #
# (RELEASE builds only) # # (RELEASE builds only) #
# DONT_CLOBBER_CC - Do not change the default setting of CC #
# OBJPATH_SUFFIX - Suffix appended to OBJPATH useful for compiling # # OBJPATH_SUFFIX - Suffix appended to OBJPATH useful for compiling #
# different options of the same source file # # different options of the same source file #
# STATIC - Create a statically linked build if possible # # STATIC - Create a statically linked build if possible #
...@@ -157,13 +156,9 @@ endif ...@@ -157,13 +156,9 @@ endif
# Compiler-specific options # Compiler-specific options
CFLAGS += -MMD CFLAGS += -MMD
ifdef BUILD_DEPENDS
ifdef DONT_CLOBBER_CC
CC ?= gcc CC ?= gcc
else CCPRE ?= ${shell if [ `echo __clang__ | $(CC) -E - | grep -v '^\#'` != __clang__ ] ; then echo clang ; elif [`echo __INTEL_COMPILER | $(CC) -E - | grep -v '^\#'` != __INTEL_COMPILER ] ; then echo icc ; else echo gcc ; fi}
CC := gcc ifdef BUILD_DEPENDS
endif
CCPRE := $(CC)
CC := $(SRC_ROOT)/build/mkdep -a CC := $(SRC_ROOT)/build/mkdep -a
CXX := $(SRC_ROOT)/build/mkdep -a CXX := $(SRC_ROOT)/build/mkdep -a
LD := echo LD := echo
...@@ -171,12 +166,6 @@ ifdef BUILD_DEPENDS ...@@ -171,12 +166,6 @@ ifdef BUILD_DEPENDS
AR := echo AR := echo
RANLIB := echo RANLIB := echo
else else
ifdef DONT_CLOBBER_CC
CC ?= gcc
else
CC := gcc
endif
CCPRE := $(CC)
CXX ?= g++ CXX ?= g++
LD ?= ld LD ?= ld
COMPILE_MSG := Compiling COMPILE_MSG := Compiling
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment