Bug 1227385 - Properly propagate $DIST from top-level after bug 1224490. r=mshal
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 25 Nov 2015 14:10:55 +0900
changeset 274731 19337a91ada3053765f0c8ba5b97b902d84610d4
parent 274730 532da45ad3b5d2db7cc54364f459c4e7618e4763
child 274732 87762ef6c3f212a620f03ac83f05d7b7325be5f4
push id68665
push usermh@glandium.org
push dateMon, 30 Nov 2015 23:27:16 +0000
treeherdermozilla-inbound@87762ef6c3f2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1227385, 1224490
milestone45.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1227385 - Properly propagate $DIST from top-level after bug 1224490. r=mshal
configure.in
js/src/configure.in
--- a/configure.in
+++ b/configure.in
@@ -9271,16 +9271,17 @@ export MOZ_ZLIB_LIBS
 export MOZ_APP_NAME
 export MOZ_APP_REMOTINGNAME
 export DONT_POPULATE_VIRTUALENV=1
 export PYTHON
 export MOZILLA_CENTRAL_PATH=$_topsrcdir
 export STLPORT_CPPFLAGS
 export STLPORT_LIBS
 export JS_STANDALONE=no
+export DIST
 export MOZ_LINKER
 export ZLIB_IN_MOZGLUE
 export MOZ_MEMORY
 
 if ! test -e js; then
     mkdir js
 fi
 
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -155,21 +155,22 @@ else
   fi
   JS_SHARED_LIBRARY=1
 fi
 AC_SUBST(JS_SHARED_LIBRARY)
 
 if test "$JS_STANDALONE" = no; then
   autoconfmk=autoconf-js.mk
   JS_STANDALONE=
+  #DIST is exported from top-level configure
 else
   JS_STANDALONE=1
   AC_DEFINE(JS_STANDALONE)
+  DIST="$MOZ_BUILD_ROOT/dist"
 fi
-DIST="$MOZ_BUILD_ROOT/dist"
 AC_SUBST(JS_STANDALONE)
 BUILDING_JS=1
 AC_SUBST(autoconfmk)
 
 MOZ_ARG_WITH_STRING(gonk,
 [  --with-gonk=DIR
                location of gonk dir],
     gonkdir=$withval)