diff options
| author | smatz <smatz@openttd.org> | 2010-09-03 14:14:06 +0000 |
|---|---|---|
| committer | smatz <smatz@openttd.org> | 2010-09-03 14:14:06 +0000 |
| commit | 3c66e1e9e86c46d7499270c5cf0edd37a1c83aef (patch) | |
| tree | c2f6da1279d9941e49b2c9503cace15b9221673f | |
| parent | f14be56a206733fcb096352610058f21b1a1f5ef (diff) | |
| download | openttd-3c66e1e9e86c46d7499270c5cf0edd37a1c83aef.tar.xz | |
(svn r20725) -Codechange: simplify make_compiler_cflags
| -rw-r--r-- | config.lib | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/config.lib b/config.lib index 4718da039..3fe61befb 100644 --- a/config.lib +++ b/config.lib @@ -1110,18 +1110,15 @@ check_params() { make_compiler_cflags() { # Params: # $1 - compiler - # $2 - the current cflags - # $3 - variable to finally write cflags to - # $4 - the current cxxflags - # $5 - variable to finally write cxxflags to - # $6 - the current ldflags - # $7 - variable to finally write ldflags to - # $8 - variable to finally write features to - - flags="$2" - cxxflags="$4" - ldflags="$6" - features="" + # $2 - name of the cflags variable + # $3 - name of the cxxflags variable + # $4 - name of the ldflags variable + # $5 - name of the features variable + + eval eval "flags=\\\$$2" + eval eval "cxxflags=\\\$$3" + eval eval "ldflags=\\\$$4" + eval eval "features=\\\$$5" if [ `basename $1 | cut -c 1-3` = "icc" ]; then # Enable some things only for certain ICC versions @@ -1217,10 +1214,10 @@ make_compiler_cflags() { fi fi - eval "$3=\"$flags\"" - eval "$5=\"$cxxflags\"" - eval "$7=\"$ldflags\"" - eval "$8=\"$features\"" + eval "$2=\"$flags\"" + eval "$3=\"$cxxflags\"" + eval "$4=\"$ldflags\"" + eval "$5=\"$features\"" } make_cflags_and_ldflags() { @@ -1243,8 +1240,8 @@ make_cflags_and_ldflags() { # FEATURES for HOST (lto) FEATURES="" - make_compiler_cflags "$cc_build" "$CFLAGS_BUILD" "CFLAGS_BUILD" "$CXXFLAGS_BUILD" "CXXFLAGS_BUILD" "$LDFLAGS_BUILD" "LDFLAGS_BUILD" "FEATURES_BUILD" - make_compiler_cflags "$cc_host" "$CFLAGS" "CFLAGS" "$CXXFLAGS" "CXXFLAGS" "$LDFLAGS" "LDFLAGS" "FEATURES" + make_compiler_cflags "$cc_build" "CFLAGS_BUILD" "CXXFLAGS_BUILD" "LDFLAGS_BUILD" "FEATURES_BUILD" + make_compiler_cflags "$cc_host" "CFLAGS" "CXXFLAGS" "LDFLAGS" "FEATURES" CFLAGS="$CFLAGS -D$os" |