Bug 1317504 - Don't try to set LD from old-configure. r=chmanchester
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 24 Nov 2016 15:47:10 +0900
changeset 324787 8c1409a443ee41860f8caaf59a149ab83c467736
parent 324786 6353e704bf2c4d47610f0e3555d2fd47c002ebda
child 324788 d63d083ab7672423620d6d83366d3e1cbae86bad
push id24
push usermaklebus@msu.edu
push dateTue, 20 Dec 2016 03:11:33 +0000
reviewerschmanchester
bugs1317504
milestone53.0a1
Bug 1317504 - Don't try to set LD from old-configure. r=chmanchester Now, it's completely unused.
build/autoconf/ios.m4
build/autoconf/jemalloc.m4
build/autoconf/toolchain.m4
build/macosx/universal/mozconfig.common
js/src/old-configure.in
old-configure.in
toolkit/mozapps/installer/informulate.py
--- a/build/autoconf/ios.m4
+++ b/build/autoconf/ios.m4
@@ -91,17 +91,16 @@ if test -n "$ios_sdk"; then
                 export CROSS_COMPILE=1
                 ;;
    esac
    ARGS=" $ARGS -isysroot $ios_sdk_path $ios_target_arg"
    # Now find our tools
    MOZ_IOS_PATH_PROG(CC, clang, $ARGS)
    MOZ_IOS_PATH_PROG(CXX, clang++, $ARGS)
    export CPP="$CC -E"
-   export LD="$CXX"
    MOZ_IOS_PATH_PROG(AR)
    MOZ_IOS_PATH_PROG(AS, as, $ARGS)
    MOZ_IOS_PATH_PROG(OTOOL)
    MOZ_IOS_PATH_PROG(STRIP)
    export PKG_CONFIG_PATH=${ios_sdk_path}/usr/lib/pkgconfig/
 fi
 
 AC_SUBST(MOZ_IOS)
--- a/build/autoconf/jemalloc.m4
+++ b/build/autoconf/jemalloc.m4
@@ -68,17 +68,17 @@ if test "$MOZ_BUILD_APP" != js -o -n "$J
       done
       ac_configure_args="$ac_configure_args --with-mangling=$MANGLED"
     fi
     unset CONFIG_FILES
     if test -z "$MOZ_TLS"; then
       ac_configure_args="$ac_configure_args --disable-tls"
     fi
     EXTRA_CFLAGS="$CFLAGS"
-    for var in AS CC CXX CPP LD AR RANLIB STRIP CPPFLAGS EXTRA_CFLAGS LDFLAGS; do
+    for var in AS CC CXX CPP AR RANLIB STRIP CPPFLAGS EXTRA_CFLAGS LDFLAGS; do
       ac_configure_args="$ac_configure_args $var='`eval echo \\${${var}}`'"
     done
 
     # jemalloc's configure assumes that if you have CFLAGS set at all, you set
     # all the flags necessary to configure jemalloc, which is not likely to be
     # the case on Windows if someone is building Firefox with flags set in
     # their mozconfig.
     if test "$_MSC_VER"; then
--- a/build/autoconf/toolchain.m4
+++ b/build/autoconf/toolchain.m4
@@ -73,17 +73,16 @@ case "${TOOLCHAIN_PREFIX}" in
     ;;
 esac
 AC_PROG_CC
 AC_PROG_CXX
 
 AC_CHECK_PROGS(RANLIB, "${TOOLCHAIN_PREFIX}ranlib", :)
 AC_CHECK_PROGS(AR, "${TOOLCHAIN_PREFIX}ar", :)
 AC_CHECK_PROGS(AS, "${TOOLCHAIN_PREFIX}as", :)
-AC_CHECK_PROGS(LD, "${TOOLCHAIN_PREFIX}ld", :)
 AC_CHECK_PROGS(LIPO, "${TOOLCHAIN_PREFIX}lipo", :)
 AC_CHECK_PROGS(STRIP, "${TOOLCHAIN_PREFIX}strip", :)
 AC_CHECK_PROGS(WINDRES, "${TOOLCHAIN_PREFIX}windres", :)
 AC_CHECK_PROGS(OTOOL, "${TOOLCHAIN_PREFIX}otool", :)
 AC_CHECK_PROGS(OBJCOPY, "${TOOLCHAIN_PREFIX}objcopy", :)
 PATH=$_SAVE_PATH
 ])
 
--- a/build/macosx/universal/mozconfig.common
+++ b/build/macosx/universal/mozconfig.common
@@ -36,20 +36,19 @@ if test "$MOZ_BUILD_APP" = "i386" -o "$M
   # conditionalized differences between builds.
   CC="$CC -arch $TARGET_CPU"
   CXX="$CXX -arch $TARGET_CPU"
 
   # These must be set for cross builds, and don't hurt straight builds.
   RANLIB="${TOOLCHAIN_PREFIX}ranlib"
   AR="${TOOLCHAIN_PREFIX}ar"
   AS=$CC
-  LD=ld
   STRIP="strip"
   OTOOL="${TOOLCHAIN_PREFIX}otool"
 
   # Each per-CPU build should be entirely oblivious to the fact that a
   # universal binary will be produced.  The exception is packager.mk, which
   # needs to know to look for universal bits when building the .dmg.
   UNIVERSAL_BINARY=1
 
-  export CC CXX HOST_CC HOST_CXX RANLIB AR AS LD STRIP OTOOL
+  export CC CXX HOST_CC HOST_CXX RANLIB AR AS STRIP OTOOL
 fi
 fi
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -103,17 +103,16 @@ if test "$COMPILE_ENVIRONMENT"; then
 if test "$target" != "$host"; then
     MOZ_CROSS_COMPILER
 else
     AC_PROG_CC
     AC_PROG_CXX
     AC_PROG_RANLIB
     MOZ_PATH_PROGS(AS, $AS as, $CC)
     AC_CHECK_PROGS(AR, ar, :)
-    AC_CHECK_PROGS(LD, ld, :)
     AC_CHECK_PROGS(STRIP, strip, :)
     AC_CHECK_PROGS(WINDRES, windres, :)
     if test -z "$HOST_CC"; then
         HOST_CC='$(CC)'
     fi
     if test -z "$HOST_CXX"; then
         HOST_CXX='$(CXX)'
     fi
@@ -2072,17 +2071,16 @@ dnl =
 dnl ========================================================
 
 AC_SUBST(AR)
 AC_SUBST(AR_FLAGS)
 AC_SUBST(AR_EXTRACT)
 AC_SUBST(AS)
 AC_SUBST(ASFLAGS)
 AC_SUBST(AS_DASH_C_FLAG)
-AC_SUBST(LD)
 AC_SUBST(RC)
 AC_SUBST(RCFLAGS)
 AC_SUBST(WINDRES)
 AC_SUBST(IMPLIB)
 AC_SUBST(FILTER)
 AC_SUBST(BIN_FLAGS)
 AC_SUBST(MOZ_DEBUG)
 AC_SUBST(MOZ_DEBUG_LDFLAGS)
--- a/old-configure.in
+++ b/old-configure.in
@@ -174,17 +174,16 @@ else
     *-mingw*)
       # Work around the conftest.exe access problem on Windows
       sleep 2
     esac
     AC_PROG_CXX
     AC_PROG_RANLIB
     MOZ_PATH_PROGS(AS, $AS as, $CC)
     AC_CHECK_PROGS(AR, ar, :)
-    AC_CHECK_PROGS(LD, ld, :)
     AC_CHECK_PROGS(STRIP, strip, :)
     AC_CHECK_PROGS(WINDRES, windres, :)
     AC_CHECK_PROGS(OTOOL, otool, :)
     if test -z "$HOST_RANLIB"; then
         HOST_RANLIB="$RANLIB"
     fi
     if test -z "$HOST_AR"; then
         HOST_AR="$AR"
@@ -5257,17 +5256,16 @@ dnl =
 dnl ========================================================
 
 AC_SUBST(AR)
 AC_SUBST(AR_FLAGS)
 AC_SUBST(AR_EXTRACT)
 AC_SUBST(AS)
 AC_SUBST(ASFLAGS)
 AC_SUBST(AS_DASH_C_FLAG)
-AC_SUBST(LD)
 AC_SUBST(RC)
 AC_SUBST(RCFLAGS)
 AC_SUBST(WINDRES)
 AC_SUBST(IMPLIB)
 AC_SUBST(FILTER)
 AC_SUBST(BIN_FLAGS)
 AC_SUBST(MOZ_AUTH_EXTENSION)
 AC_SUBST(MOZ_PREF_EXTENSIONS)
@@ -5936,17 +5934,16 @@ unset MOZ_BUILD_APP
 export DIST
 export MOZ_LINKER
 export ZLIB_IN_MOZGLUE
 export AR
 export RANLIB
 export CPP
 export CC
 export CXX
-export LD
 export ARFLAGS
 export CPPFLAGS
 export CFLAGS
 export CXXFLAGS
 export LDFLAGS
 export HOST_CC
 export HOST_CXX
 export HOST_CFLAGS
--- a/toolkit/mozapps/installer/informulate.py
+++ b/toolkit/mozapps/installer/informulate.py
@@ -27,17 +27,17 @@ def main():
         exit(1)
 
     all_key_value_pairs = {}
     important_substitutions = [
         'target_alias', 'target_cpu', 'target_os', 'target_vendor',
         'host_alias', 'host_cpu', 'host_os', 'host_vendor',
         'MOZ_UPDATE_CHANNEL', 'MOZ_APP_VENDOR', 'MOZ_APP_NAME',
         'MOZ_APP_VERSION', 'MOZ_APP_MAXVERSION', 'MOZ_APP_ID',
-        'CC', 'CXX', 'LD', 'AS']
+        'CC', 'CXX', 'AS']
 
     all_key_value_pairs = dict([(x.lower(), buildconfig.substs[x]) for x in important_substitutions])
     all_key_value_pairs.update(parse_cmdline(sys.argv[2:]))
 
     with open(sys.argv[1], "w+") as f:
         json.dump(all_key_value_pairs, f, indent=2, sort_keys=True)
         f.write('\n')