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

Change: [Build] use flags set by env at the end, not at the start (based on patch by adf88) (#6715) 

This closes #6433
pull/6720/head
Patric Stout 2018-04-14 20:11:49 +02:00 committed by GitHub
parent 34cc1f8b7c
commit f06061aa3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
config.lib
View File

@ -1481,21 +1481,27 @@ make_compiler_cflags() {
make_cflags_and_ldflags() { make_cflags_and_ldflags() {
# General CFlags for BUILD # General CFlags for BUILD
CFLAGS_BUILD="$CFLAGS_BUILD" CFLAGS_BUILD_ENV="$CFLAGS_BUILD"
CFLAGS_BUILD=""
# Special CXXFlags for BUILD # Special CXXFlags for BUILD
CXXFLAGS_BUILD="$CXXFLAGS_BUILD" CXXFLAGS_BUILD_ENV="$CXXFLAGS_BUILD"
CXXFLAGS_BUILD=""
# LDFLAGS for BUILD # LDFLAGS for BUILD
LDFLAGS_BUILD="$LDFLAGS_BUILD" LDFLAGS_BUILD_ENV="$LDFLAGS_BUILD"
LDFLAGS_BUILD=""
# FEATURES for BUILD (lto) # FEATURES for BUILD (lto)
FEATURES_BUILD="" FEATURES_BUILD=""
# General CFlags for HOST # General CFlags for HOST
CFLAGS="$CFLAGS" CFLAGS_ENV="$CFLAGS"
CFLAGS=""
# Special CXXFlags for HOST # Special CXXFlags for HOST
CXXFLAGS="$CXXFLAGS" CXXFLAGS_ENV="$CXXFLAGS"
CXXFLAGS=""
# Libs to compile. In fact this is just LDFLAGS # Libs to compile. In fact this is just LDFLAGS
LIBS="-lstdc++" LIBS="-lstdc++"
# LDFLAGS used for HOST # LDFLAGS used for HOST
LDFLAGS="$LDFLAGS" LDFLAGS_ENV="$LDFLAGS"
LDFLAGS=""
# FEATURES for HOST (lto) # FEATURES for HOST (lto)
FEATURES="" FEATURES=""
@ -1913,6 +1919,14 @@ make_cflags_and_ldflags() {
fi fi
fi fi
# All flags to be extended via the env
CFLAGS_BUILD="$CFLAGS_BUILD $CFLAGS_BUILD_ENV"
CXXFLAGS_BUILD="$CXXFLAGS_BUILD $CXXFLAGS_BUILD_ENV"
LDFLAGS_BUILD="$LDFLAGS_BUILD $LDFLAGS_BUILD_ENV"
CFLAGS="$CFLAGS $CFLAGS_ENV"
CXXFLAGS="$CXXFLAGS $CXXFLAGS_ENV"
LDFLAGS="$LDFLAGS $LDFLAGS_ENV"
log 1 "using CFLAGS_BUILD... $CFLAGS_BUILD" log 1 "using CFLAGS_BUILD... $CFLAGS_BUILD"
log 1 "using CXXFLAGS_BUILD... $CXXFLAGS_BUILD" log 1 "using CXXFLAGS_BUILD... $CXXFLAGS_BUILD"
log 1 "using LDFLAGS_BUILD... $LDFLAGS_BUILD" log 1 "using LDFLAGS_BUILD... $LDFLAGS_BUILD"