Bug 1517419 - Pass AR down to js configure. r=froydnj
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 08 Jan 2019 16:10:06 +0000
changeset 510067 c98bbcbc6a6c09cac0c291c4b733903c382bd33b
parent 510066 9635e730e0be047e046656c6fa98142547e9e664
child 510068 5ecacfcd6e65fe5a1dee88b40ef00ca20c0282e8
push id10547
push userffxbld-merge
push dateMon, 21 Jan 2019 13:03:58 +0000
treeherdermozilla-beta@24ec1916bffe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1517419, 1515595
milestone66.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 1517419 - Pass AR down to js configure. r=froydnj This is a followup for bug 1515595. Differential Revision: https://phabricator.services.mozilla.com/D15906
build/moz.configure/toolchain.configure
old-configure.in
--- a/build/moz.configure/toolchain.configure
+++ b/build/moz.configure/toolchain.configure
@@ -2216,12 +2216,13 @@ def ar_config(link, toolchain_prefix):
             )
     return namespace(
         names=tuple('%s%s' % (p, 'ar')
                    for p in (toolchain_prefix or ()) + ('',)),
         flags=('crs', '$@'),
     )
 
 
-check_prog('AR', ar_config.names, paths=toolchain_search_path)
-
+ar = check_prog('AR', ar_config.names, paths=toolchain_search_path)
+
+add_old_configure_assignment('AR', ar)
 
 set_config('AR_FLAGS', ar_config.flags)
--- a/old-configure.in
+++ b/old-configure.in
@@ -3968,16 +3968,17 @@ export CARGO
 export MOZILLA_CENTRAL_PATH=$_topsrcdir
 export STLPORT_CPPFLAGS
 export STLPORT_LIBS
 unset MOZ_BUILD_APP
 export DIST
 export MOZ_LINKER
 export ZLIB_IN_MOZGLUE
 export RANLIB
+export AR
 export CPP
 export CC
 export CXX
 export CPPFLAGS
 export CFLAGS
 export CXXFLAGS
 export LDFLAGS
 export HOST_CC