diff options
author | Andre McCurdy <armccurdy@gmail.com> | 2015-04-21 10:34:05 -0700 |
---|---|---|
committer | Rich Felker <dalias@aerifal.cx> | 2015-04-21 13:38:48 -0400 |
commit | a6274a1971b7aa1d12fdce3d040f847539a71049 (patch) | |
tree | adc522bcde7a7d91fc665fb2fb32cc8d0731ddd4 | |
parent | ea1b6bb6123d2177508ddca438669ec96cfa0021 (diff) | |
download | musl-a6274a1971b7aa1d12fdce3d040f847539a71049.tar.gz |
configure: check for -march and -mtune passed via CC
Some build environments pass -march and -mtune as part of CC, therefore
update configure to check both CC and CFLAGS before making the decision
to fall back to generic -march and -mtune options for x86.
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
-rwxr-xr-x | configure | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -391,10 +391,12 @@ tryflag CFLAGS_AUTO -Wa,--noexecstack # extensions enabled by default. This is bad for making static binaries. # We cheat and use i486 rather than i386 because i386 really does not # work anyway (issues with atomic ops). +# Some build environments pass -march and -mtune options via CC, so +# check both CC and CFLAGS. # if test "$ARCH" = "i386" ; then -fnmatch '-march=*|*\ -march=*' "$CFLAGS" || tryldflag CFLAGS_AUTO -march=i486 -fnmatch '-mtune=*|*\ -mtune=*' "$CFLAGS" || tryldflag CFLAGS_AUTO -mtune=generic +fnmatch '-march=*|*\ -march=*' "$CC $CFLAGS" || tryldflag CFLAGS_AUTO -march=i486 +fnmatch '-mtune=*|*\ -mtune=*' "$CC $CFLAGS" || tryldflag CFLAGS_AUTO -mtune=generic fi # |