Only disable optimizations when cross-compiling

diff --git a/Makefile.in b/Makefile.in
index 59783d287ca5d18b1217ad7e501b8777d4511e5d..f96c29e7b7a632657ad9a14b661fd66d5c211879 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -133,13 +133,14 @@ libb2_options = \
     --disable-shared \
     --enable-static
 
-# cross compilation
-libb2_options += \
-    --build=@build_alias@ \
-    --host=@host_alias@ \
-    --target=@target_alias@ \
-    --disable-fat \
-    --disable-native
+@disable_cross@# cross compilation
+@disable_cross@libb2_options += \
+@disable_cross@    --build=@build_alias@ \
+@disable_cross@    --host=@host_alias@ \
+@disable_cross@    --target=@target_alias@ \
+@disable_cross@    --disable-openmp \
+@disable_cross@    --disable-fat \
+@disable_cross@    --disable-native
 
 src/libb2/src/.libs/libb2.a:
        cd src/libb2 && ./configure ${libb2_options} CC="$(CC)"

diff --git a/configure.ac b/configure.ac
index d5d6a28aca50c4e3f8ff6b465e39aa7312226d29..4217f4a02ec00203765b90a4235a7229a5dc480b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -19,6 +19,7 @@ case $host in
         ;;
 esac
 
+AC_SUBST(disable_cross)
 AC_SUBST(disable_man)
 AC_SUBST(extra_libs)
 AC_SUBST(extra_sources)
@@ -200,6 +201,12 @@ else
     extra_libs="$extra_libs src/libb2/src/.libs/libb2.a"
 fi
 
+if test "$cross_compiling" != no -o "$host_cpu" != 'x86_64'; then
+    disable_cross=''
+else
+    disable_cross='#'
+fi
+
 AC_ARG_ENABLE(man,
   [AS_HELP_STRING([--disable-man],
     [disable installing man pages])])