Bug 1091118 - Also export RANLIB to unbust android builds on mac. r=gps, a=lmandel
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 31 Oct 2014 08:51:33 +0900
changeset 225886 12a8a2d96453
parent 225885 17d3079dc41f
child 225888 73905ff57286
push id4055
push userryanvm@gmail.com
push date2014-10-31 01:17 +0000
treeherdermozilla-beta@12a8a2d96453 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps, lmandel
bugs1091118
milestone34.0
Bug 1091118 - Also export RANLIB to unbust android builds on mac. r=gps, a=lmandel
configure.in
--- a/configure.in
+++ b/configure.in
@@ -9076,19 +9076,19 @@ if test "$MOZ_TREE_FREETYPE"; then
    export ZLIB_CFLAGS="$MOZ_ZLIB_CFLAGS "
    export ZLIB_LIBS="$MOZ_ZLIB_LIBS "
    export CONFIG_FILES="unix-cc.mk:unix-cc.in unix-def.mk:unix-def.in freetype-config freetype2.pc:freetype2.in"
    ac_configure_args="$ac_configure_args --host=$target --disable-shared --with-pic=yes --with-zlib=yes --without-bzip2 --with-png=yes --without-harfbuzz"
 
    if ! test -e modules; then
      mkdir modules
    fi
-   # Only export CC and CXX for the subconfigure, and avoid spilling that
-   # further down the road.
-   (export CC CXX;
+   # Only export CC, CXX and RANLIB for the subconfigure, and avoid spilling
+   # that further down the road.
+   (export CC CXX RANLIB;
     AC_OUTPUT_SUBDIRS(modules/freetype2)
    ) || exit 1
 fi
 
 if test -z "$direct_nspr_config"; then
     dnl ========================================================
     dnl = Setup a nice relatively clean build environment for
     dnl = sub-configures.