summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.src.in11
-rw-r--r--config.lib11
2 files changed, 2 insertions, 20 deletions
diff --git a/Makefile.src.in b/Makefile.src.in
index 044aea3a6..78150f1ad 100644
--- a/Makefile.src.in
+++ b/Makefile.src.in
@@ -4,7 +4,6 @@ CC_BUILD = !!CC_BUILD!!
CXX_BUILD = !!CXX_BUILD!!
WINDRES = !!WINDRES!!
STRIP = !!STRIP!!
-CC_CFLAGS = !!CC_CFLAGS!!
CFLAGS = !!CFLAGS!!
CFLAGS_BUILD = !!CFLAGS_BUILD!!
LIBS = !!LIBS!!
@@ -100,7 +99,7 @@ REV_NR := 0
endif
# This helps to recompile if flags change
-RES := $(shell if [ "`cat $(CONFIG_CACHE_COMPILER) 2>/dev/null`" != "$(CC_CFLAGS) $(CFLAGS)" ]; then echo "$(CC_CFLAGS) $(CFLAGS)" > $(CONFIG_CACHE_COMPILER); fi )
+RES := $(shell if [ "`cat $(CONFIG_CACHE_COMPILER) 2>/dev/null`" != "$(CFLAGS)" ]; then echo "$(CFLAGS)" > $(CONFIG_CACHE_COMPILER); fi )
RES := $(shell if [ "`cat $(CONFIG_CACHE_LINKER) 2>/dev/null`" != "$(LDFLAGS) $(LIBS)" ]; then echo "$(LDFLAGS) $(LIBS)" > $(CONFIG_CACHE_LINKER); fi )
RES := $(shell if [ "`cat $(CONFIG_CACHE_ENDIAN) 2>/dev/null`" != "$(ENDIAN_FORCE)" ]; then echo "$(ENDIAN_FORCE)" > $(CONFIG_CACHE_ENDIAN); fi )
@@ -127,10 +126,6 @@ endif
# Find the deps via GCC. Rarely wrong, but a bit slow
-$(OBJS_C:%.o=%.d): %.d: $(SRC_DIR)/%.c $(FILE_DEP)
- $(E) '$(STAGE) DEP $(<:$(SRC_DIR)/%.c=%.c)'
- $(Q)$(CC_HOST) $(CC_CFLAGS) $(CFLAGS) -MM $< | sed 's@^$(@F:%.d=%.o):@$@ $(@:%.d=%.o):@' > $@
-
$(OBJS_CPP:%.o=%.d): %.d: $(SRC_DIR)/%.cpp $(FILE_DEP)
$(E) '$(STAGE) DEP $(<:$(SRC_DIR)/%.cpp=%.cpp)'
$(Q)$(CXX_HOST) $(CFLAGS) -MM $< | sed 's@^$(@F:%.d=%.o):@$@ $(@:%.d=%.o):@' > $@
@@ -219,10 +214,6 @@ endif
# Compile all the files according to the targets
-$(OBJS_C): %.o: $(SRC_DIR)/%.c $(DEP_MASK) $(FILE_DEP)
- $(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.c=%.c)'
- $(Q)$(CC_HOST) $(CC_CFLAGS) $(CFLAGS) -c -o $@ $<
-
$(OBJS_CPP): %.o: $(SRC_DIR)/%.cpp $(DEP_MASK) $(FILE_DEP)
$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
$(Q)$(CXX_HOST) $(CFLAGS) -c -o $@ $<
diff --git a/config.lib b/config.lib
index 313061396..59a53986d 100644
--- a/config.lib
+++ b/config.lib
@@ -1032,8 +1032,6 @@ make_cflags_and_ldflags() {
CFLAGS_BUILD=""
# General CFlags for HOST
CFLAGS="$CFLAGS -D$os"
- # CFlags for HOST and C-Compiler
- CC_FLAGS=""
# Libs to compile. In fact this is just LDFLAGS
LIBS="-lstdc++"
# LDFLAGS used for HOST
@@ -1112,17 +1110,11 @@ make_cflags_and_ldflags() {
CFLAGS="$CFLAGS -W -Wno-unused-parameter -Wformat=2"
CFLAGS="$CFLAGS -Wredundant-decls"
- CC_CFLAGS="$CC_CFLAGS -Wstrict-prototypes"
-
if [ $enable_assert -eq 0 ]; then
# Do not warn about unused variables when building without asserts
CFLAGS="$CFLAGS -Wno-unused-variable"
fi
- if [ $cc_version -ge 34 ]; then
- CC_CFLAGS="$CC_CFLAGS -Wdeclaration-after-statement -Wold-style-definition"
- fi
-
if [ "$os" = "CYGWIN" ]; then
CFLAGS="$CFLAGS -mwin32"
LDFLAGS="$LDFLAGS -mwin32"
@@ -1414,7 +1406,7 @@ make_cflags_and_ldflags() {
CFLAGS="$CFLAGS -DGLOBAL_DATA_DIR=\\\\\"$prefix_dir/$data_dir\\\\\""
- log 1 "using CFLAGS... $CFLAGS $CC_CFLAGS"
+ log 1 "using CFLAGS... $CFLAGS"
log 1 "using LDFLAGS... $LIBS $LDFLAGS"
# Makedepend doesn't like something like: -isysroot /OSX/blabla
@@ -2603,7 +2595,6 @@ make_sed() {
s@!!WINDRES!!@$windres@g;
s@!!STRIP!!@$strip $strip_arg@g;
s@!!LIPO!!@$lipo@g;
- s@!!CC_CFLAGS!!@$CC_CFLAGS@g;
s@!!CFLAGS!!@$T_CFLAGS@g;
s@!!CFLAGS_BUILD!!@$CFLAGS_BUILD@g;
s@!!STRGEN_FLAGS!!@$strgen_flags@g;