Merge branch 'disable_opt' of https://github.com/sitsofe/fio

* 'disable_opt' of https://github.com/sitsofe/fio:
  appveyor: disable setting compiler march
  configure: make --disable-optimizations disable march=native

diff --git a/appveyor.yml b/appveyor.yml
index c6c36893931af8dd58109617e75a8003f1152b60..09ebccf82c546c39c08092168471263db39864a0 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -17,7 +17,7 @@ install:
   - SET PATH=%CYG_ROOT%\bin;%PATH% # NB: Changed env variables persist to later sections
 
 build_script:
-  - 'bash.exe -lc "cd \"${APPVEYOR_BUILD_FOLDER}\" && ./configure --extra-cflags=\"-Werror\" ${CONFIGURE_OPTIONS} && make.exe'
+  - 'bash.exe -lc "cd \"${APPVEYOR_BUILD_FOLDER}\" && ./configure --disable-native --extra-cflags=\"-Werror\" ${CONFIGURE_OPTIONS} && make.exe'
 
 after_build:
   - cd os\windows && dobuild.cmd %PLATFORM%

diff --git a/configure b/configure
index 9a8a7544164b81bb256227b7bde18fd6435d220b..aefd5bb08c0539747378542233a3fc1141e66154 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # Fio configure script. Heavily influenced by the manual qemu configure
-# script. Sad this this is easier than autoconf and enemies.
+# script. Sad this is easier than autoconf and enemies.
 #
 
 # set temporary file name
@@ -2114,7 +2114,8 @@ int main(int argc, char **argv)
   return 0;
 }
 EOF
-if test "$disable_native" = "no" && compile_prog "-march=native" "" "march=native"; then
+if test "$disable_native" = "no" && test "$disable_opt" != "yes" && \
+   compile_prog "-march=native" "" "march=native"; then
   build_native="yes"
 fi
 print_config "Build march=native" "$build_native"