dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r27557) -Fix: bashism that caused different CFLAGS with bash vs dash

Browse Source
This commit is contained in:
rubidium
2016-05-11 18:38:44 +00:00
parent f0db8a16d5
commit b892103747
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config.lib
View File

@@ -1490,7 +1490,7 @@ make_cflags_and_ldflags() {
fi fi
if [ $enable_debug -le 2 ]; then if [ $enable_debug -le 2 ]; then
cc_host_is_gcc=`basename "$cc_host" | grep "gcc" &>/dev/null` cc_host_is_gcc=`basename "$cc_host" | grep "gcc" 2>/dev/null`
if [ -n "$cc_host_is_gcc" ]; then if [ -n "$cc_host_is_gcc" ]; then
# Define only when compiling with GCC. Some GLIBC versions use GNU # Define only when compiling with GCC. Some GLIBC versions use GNU
# extensions in a way that breaks build with at least ICC. # extensions in a way that breaks build with at least ICC.
@@ -1498,7 +1498,7 @@ make_cflags_and_ldflags() {
CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2" CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
fi fi
cc_build_is_gcc=`basename "$cc_build" | grep "gcc" &>/dev/null` cc_build_is_gcc=`basename "$cc_build" | grep "gcc" 2>/dev/null`
if [ -n "$cc_build_is_gcc" ]; then if [ -n "$cc_build_is_gcc" ]; then
# Just add -O1 to the tools needed for building. # Just add -O1 to the tools needed for building.
CFLAGS_BUILD="$CFLAGS_BUILD -D_FORTIFY_SOURCE=2 -O1" CFLAGS_BUILD="$CFLAGS_BUILD -D_FORTIFY_SOURCE=2 -O1"