Backed out 2 changesets (bug 1289847) for OSX static build bustage CLOSED TREE

Backed out changeset 74922f9ce5c6 (bug 1289847)
Backed out changeset f22763859aae (bug 1289847)

browser/config/tooltool-manifests/macosx64/releng.manifest

@@ -23,14 +23,6 @@
 "unpack": true
 },
 {
-"version": "cctools port from commit hash db1f8d906cb28, ld only",
-"size": 634496,
-"digest": "037f31fcf29e7bb7fada0d2bdd5e95c7d4cb2692f2a5c98ed6f6a7561b9d81622d015f0d12b291d3667719655f1369e8ce8a0a4a4773aa0ee4753e04a8821173",
-"algorithm": "sha512",
-"filename": "cctools.tar.bz2",
-"unpack": true
-},
-{
 "size": 167175,
 "digest": "0b71a936edf5bd70cf274aaa5d7abc8f77fe8e7b5593a208f805cc9436fac646b9c4f0b43c2b10de63ff3da671497d35536077ecbc72dba7f8159a38b580f831",
 "algorithm": "sha512",

build/macosx/local-mozconfig.common

@@ -24,13 +24,6 @@ elif [ -d "$topsrcdir/../clang" ]; then
     export DSYMUTIL=$topsrcdir/../clang/bin/llvm-dsymutil
 fi
 
-# Use an updated linker.
-ldflags="-B$topsrcdir/cctools/bin"
-# Ensure the updated linker doesn't generate things our older build tools
-# don't understand.
-ldflags="$ldflags -Wl,-no_data_in_code_info"
-export LDFLAGS="$ldflags"
-
 # If not set use the system default clang
 if [ -z "$CC" ]; then
     export CC=clang

toolkit/library/moz.build

@@ -59,11 +59,6 @@ def Libxul(name):
     if CONFIG['MOZ_NEEDS_LIBATOMIC']:
         OS_LIBS += ['atomic']
 
-    # This option should go away in bug 1290972, but we need to wait until
-    # Rust 1.12 has been released.
-    if CONFIG['MOZ_RUST'] and CONFIG['OS_ARCH'] == 'Darwin':
-        LDFLAGS += ['-Wl,-no_compact_unwind']
-
 Libxul('xul')
 
 SDK_LIBRARY = True