mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r20725) -Codechange: simplify make_compiler_cflags

release/1.1
smatz 2010-09-03 14:14:06 +00:00
parent f14be56a20
commit 3c66e1e9e8
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
config.lib
View File

@ -1110,18 +1110,15 @@ check_params() {
make_compiler_cflags() { make_compiler_cflags() {
# Params: # Params:
# $1 - compiler # $1 - compiler
# $2 - the current cflags # $2 - name of the cflags variable
# $3 - variable to finally write cflags to # $3 - name of the cxxflags variable
# $4 - the current cxxflags # $4 - name of the ldflags variable
# $5 - variable to finally write cxxflags to # $5 - name of the features variable
# $6 - the current ldflags
# $7 - variable to finally write ldflags to
# $8 - variable to finally write features to
flags="$2" eval eval "flags=\\\$$2"
cxxflags="$4" eval eval "cxxflags=\\\$$3"
ldflags="$6" eval eval "ldflags=\\\$$4"
features="" eval eval "features=\\\$$5"
if [ `basename $1 | cut -c 1-3` = "icc" ]; then if [ `basename $1 | cut -c 1-3` = "icc" ]; then
# Enable some things only for certain ICC versions # Enable some things only for certain ICC versions
@ -1217,10 +1214,10 @@ make_compiler_cflags() {
fi fi
fi fi
eval "$3=\"$flags\"" eval "$2=\"$flags\""
eval "$5=\"$cxxflags\"" eval "$3=\"$cxxflags\""
eval "$7=\"$ldflags\"" eval "$4=\"$ldflags\""
eval "$8=\"$features\"" eval "$5=\"$features\""
} }
make_cflags_and_ldflags() { make_cflags_and_ldflags() {
@ -1243,8 +1240,8 @@ make_cflags_and_ldflags() {
# FEATURES for HOST (lto) # FEATURES for HOST (lto)
FEATURES="" FEATURES=""
make_compiler_cflags "$cc_build" "$CFLAGS_BUILD" "CFLAGS_BUILD" "$CXXFLAGS_BUILD" "CXXFLAGS_BUILD" "$LDFLAGS_BUILD" "LDFLAGS_BUILD" "FEATURES_BUILD" make_compiler_cflags "$cc_build" "CFLAGS_BUILD" "CXXFLAGS_BUILD" "LDFLAGS_BUILD" "FEATURES_BUILD"
make_compiler_cflags "$cc_host" "$CFLAGS" "CFLAGS" "$CXXFLAGS" "CXXFLAGS" "$LDFLAGS" "LDFLAGS" "FEATURES" make_compiler_cflags "$cc_host" "CFLAGS" "CXXFLAGS" "LDFLAGS" "FEATURES"
CFLAGS="$CFLAGS -D$os" CFLAGS="$CFLAGS -D$os"