Bug 1519310 - Remove direct_nspr_config-related code from old-configure. r=dmajor
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 11 Jan 2019 13:11:57 +0000
changeset 510666 6eff10f846d7d49fe53ddfadd7e730ff738679bb
parent 510665 e118466df64d23a07d2b01296c83789b93d43bfa
child 510667 8bb28e41610207c5c3a1dce892a1bb387b1dda94
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)
reviewersdmajor
bugs1519310
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 1519310 - Remove direct_nspr_config-related code from old-configure. r=dmajor This was useful when old-configure was calling nspr configure, but now is noop. Differential Revision: https://phabricator.services.mozilla.com/D16285
old-configure.in
--- a/old-configure.in
+++ b/old-configure.in
@@ -607,19 +607,17 @@ case "$target" in
 #error not iOS
 #endif],
                                    [],
                                    ac_cv_ios_target="yes",
                                    ac_cv_ios_target="no")])
     if test "$ac_cv_ios_target" = "yes" -a -z $MOZ_IOS; then
        AC_MSG_ERROR([targeting iOS but not using an iOS SDK?])
     fi
-    if test -n "$MOZ_IOS"; then
-        direct_nspr_config=1
-    else
+    if test -z "$MOZ_IOS"; then
         # The ExceptionHandling framework is needed for Objective-C exception
         # logging code in nsObjCExceptions.h. Currently we only use that in debug
         # builds.
         MOZ_DEBUG_LDFLAGS="$MOZ_DEBUG_LDFLAGS -framework ExceptionHandling";
     fi
 
     dnl DTrace and -dead_strip don't interact well. See bug 403132.
     dnl ===================================================================
@@ -3824,33 +3822,16 @@ HAVE_SYS_MOUNT_H
 AC_DEFINE(NO_NSPR_10_SUPPORT)
 
 # Don't build NSS libpkix
 NSS_DISABLE_LIBPKIX=1
 AC_SUBST(NSS_DISABLE_LIBPKIX)
 
 MOZ_CREATE_CONFIG_STATUS()
 
-if test -z "$direct_nspr_config"; then
-    dnl ========================================================
-    dnl = Setup a nice relatively clean build environment for
-    dnl = sub-configures.
-    dnl ========================================================
-    CC="$_SUBDIR_CC"
-    CXX="$_SUBDIR_CXX"
-    CFLAGS="$_SUBDIR_CFLAGS"
-    CPPFLAGS="$_SUBDIR_CPPFLAGS"
-    CXXFLAGS="$_SUBDIR_CXXFLAGS"
-    LDFLAGS="$_SUBDIR_LDFLAGS"
-    HOST_CC="$_SUBDIR_HOST_CC"
-    HOST_CFLAGS="$_SUBDIR_HOST_CFLAGS"
-    HOST_CXXFLAGS="$_SUBDIR_HOST_CXXFLAGS"
-    HOST_LDFLAGS="$_SUBDIR_HOST_LDFLAGS"
-fi
-
 unset MAKEFILES
 unset CONFIG_FILES
 
 if test "$COMPILE_ENVIRONMENT" -a "$MOZ_WIDGET_TOOLKIT"; then
 
 
 dnl ========================================================
 dnl = Setup a nice relatively clean build environment for