Bug 1524429 - MOZ_ANDROID_CPU_ARCH doesn't need MOZ_ARCH. r=nalexander
☠☠ backed out by fece5bb7e809 ☠ ☠
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 19 Mar 2019 17:09:41 +0000
changeset 465131 1a5a5aef01d5b745fa7ebd0185556b01f16b7c4f
parent 465130 13e9a230eb255fb95dd9e0d40db978717afa6a05
child 465132 7947b90f15808c0de5673831950fe2886558d23c
push id35732
push useropoprus@mozilla.com
push dateWed, 20 Mar 2019 10:52:37 +0000
treeherdermozilla-central@708979f9c3f3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1524429, 1397776
milestone68.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 1524429 - MOZ_ANDROID_CPU_ARCH doesn't need MOZ_ARCH. r=nalexander It hasn't needed it since bug 1397776. Differential Revision: https://phabricator.services.mozilla.com/D24000
js/src/old-configure.in
old-configure.in
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -297,18 +297,17 @@ MOZ_USER_DIR=".mozilla"
 
 MOZ_FIX_LINK_PATHS="-Wl,-rpath-link,${DIST}/bin -Wl,-rpath-link,${prefix}/lib"
 
 dnl Configure platform-specific CPU architecture compiler options.
 dnl ==============================================================
 MOZ_ARCH_OPTS
 
 dnl ========================================================
-dnl Android libstdc++, placed here so it can use MOZ_ARCH
-dnl computed above.
+dnl Android libstdc++
 dnl ========================================================
 
 MOZ_ANDROID_CPU_ARCH
 MOZ_ANDROID_STLPORT
 
 dnl ========================================================
 dnl Suppress Clang Argument Warnings
 dnl ========================================================
--- a/old-configure.in
+++ b/old-configure.in
@@ -278,26 +278,20 @@ MOZ_USER_DIR=".mozilla"
 MOZ_FIX_LINK_PATHS="-Wl,-rpath-link,${DIST}/bin -Wl,-rpath-link,${prefix}/lib"
 
 MOZ_FS_LAYOUT=unix
 
 dnl Configure platform-specific CPU architecture compiler options.
 dnl ==============================================================
 if test "$COMPILE_ENVIRONMENT"; then
     MOZ_ARCH_OPTS
-else
-    if test "$OS_TARGET" = Android; then
-        dnl Default Android builds to ARMv7.
-        MOZ_ARCH=armv7-a
-    fi
 fi # COMPILE_ENVIRONMENT
 
 dnl ========================================================
-dnl Android libstdc++, placed here so it can use MOZ_ARCH
-dnl computed above.
+dnl Android libstdc++
 dnl ========================================================
 
 MOZ_ANDROID_CPU_ARCH
 if test "$COMPILE_ENVIRONMENT"; then
     MOZ_ANDROID_STLPORT
 fi # COMPILE_ENVIRONMENT
 
 dnl ========================================================