Bug 763920 - Avoid hardcoding page size for jemalloc unless cross compiling. r=khuey
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 19 Jun 2012 09:13:16 +0200
changeset 99727 86cf33eb20091690db75b83a676c61c95c04579a
parent 99726 aa9532ebf77de38cb7a5348d41bb8356f3d1d134
child 99728 31e9fbf97eb113f24f59e6d17dc61b2ab473136c
push id1729
push userlsblakk@mozilla.com
push dateMon, 16 Jul 2012 20:02:43 +0000
treeherdermozilla-aurora@f4e75e148951 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey
bugs763920
milestone16.0a1
Bug 763920 - Avoid hardcoding page size for jemalloc unless cross compiling. r=khuey
configure.in
--- a/configure.in
+++ b/configure.in
@@ -8936,17 +8936,19 @@ if test "$MOZ_JEMALLOC" -a "$MOZ_MEMORY"
   unset CONFIG_FILES
   if test -z "$MOZ_TLS"; then
     ac_configure_args="$ac_configure_args --disable-tls"
   fi
   EXTRA_CFLAGS="$CFLAGS"
   for var in AS CC CXX CPP LD AR RANLIB STRIP CPPFLAGS EXTRA_CFLAGS LDFLAGS; do
     ac_configure_args="$ac_configure_args $var='`eval echo \\${${var}}`'"
   done
-  ac_configure_args="$ac_configure_args je_cv_static_page_shift=12"
+  if test "$CROSS_COMPILE"; then
+    ac_configure_args="$ac_configure_args je_cv_static_page_shift=12"
+  fi
   _save_cache_file="$cache_file"
   cache_file=$_objdir/memory/jemalloc/src/config.cache
   AC_OUTPUT_SUBDIRS(memory/jemalloc/src)
   cache_file="$_save_cache_file"
   ac_configure_args="$_SUBDIR_CONFIG_ARGS"
 fi
 
 dnl Build libunwind for Android profiling builds