diff options
author | rubidium <rubidium@openttd.org> | 2009-06-22 20:22:04 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2009-06-22 20:22:04 +0000 |
commit | 952f74086600de7088744b933e9b1f51019caa84 (patch) | |
tree | 6b6e02a8069701316f26cf14b0681c25e48785f9 /config.lib | |
parent | 95a1bbdd7dc15311cf68faf8705a1ea80b0868fd (diff) | |
download | openttd-952f74086600de7088744b933e9b1f51019caa84.tar.xz |
(svn r16623) -Change: remove CC_CFLAGS as we're not using a C compiler anywhere at all
Diffstat (limited to 'config.lib')
-rw-r--r-- | config.lib | 11 |
1 files changed, 1 insertions, 10 deletions
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; |