summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2018-03-07 08:32:05 -0700
committerJens Axboe <axboe@kernel.dk>2018-03-07 08:32:05 -0700
commit9f75af77ea4b13cd44e5246426dbdbceff22f27c (patch)
treee809c64c7e7a1c971a11599c0ab9dbc927a720f9 /configure
parent674456bf7d0f775f774c8097c8bcb98b48cccc51 (diff)
downloadfio-9f75af77ea4b13cd44e5246426dbdbceff22f27c.tar.gz
fio-9f75af77ea4b13cd44e5246426dbdbceff22f27c.tar.bz2
configure: don't override march if already set
Some archs (like arm or s390) already set an appropriate architecture, so don't override it for those cases. Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure5
1 files changed, 4 insertions, 1 deletions
diff --git a/configure b/configure
index 589ff3fe..9a8a7544 100755
--- a/configure
+++ b/configure
@@ -146,6 +146,7 @@ pmem="no"
disable_lex=""
disable_pmem="no"
disable_native="no"
+march_set="no"
prefix=/usr/local
# parse options
@@ -2065,6 +2066,7 @@ EOF
if compile_prog "-march=armv8-a+crc+crypto" "" ""; then
march_armv8_a_crc_crypto="yes"
CFLAGS="$CFLAGS -march=armv8-a+crc+crypto -DARCH_HAVE_CRC_CRYPTO"
+ march_set="yes"
fi
fi
print_config "march_armv8_a_crc_crypto" "$march_armv8_a_crc_crypto"
@@ -2287,6 +2289,7 @@ fi
if test "$s390_z196_facilities" = "yes" ; then
output_sym "CONFIG_S390_Z196_FACILITIES"
CFLAGS="$CFLAGS -march=z9-109"
+ march_set="yes"
fi
if test "$gfapi" = "yes" ; then
output_sym "CONFIG_GFAPI"
@@ -2360,7 +2363,7 @@ fi
if test "$mkdir_two" = "yes" ; then
output_sym "CONFIG_HAVE_MKDIR_TWO"
fi
-if test "$build_native" = "yes" ; then
+if test "$march_set" = "no" && test "$build_native" = "yes" ; then
output_sym "CONFIG_BUILD_NATIVE"
fi