Revert of roll clang 254049:254793

tools/clang/scripts/package.py

Index: tools/clang/scripts/package.py
diff --git a/tools/clang/scripts/package.py b/tools/clang/scripts/package.py
index 0a18d759cf62f4672472892fb3c4ed97eecc8092..a758a7bc4e1749e8b72dd2be982ccbb533246e52 100755
--- a/tools/clang/scripts/package.py
+++ b/tools/clang/scripts/package.py
@@ -66,6 +66,11 @@
       return 1
 
   parser = argparse.ArgumentParser(description='build and package clang')
+  parser.add_argument('--gcc-toolchain',
+                      help="the prefix for the GCC version used for building. "
+                           "For /opt/foo/bin/gcc, pass "
+                           "'--gcc-toolchain '/opt/foo'")
+
   args = parser.parse_args()
 
   with open('buildlog.txt', 'w') as log:
@@ -105,6 +110,8 @@
 
     build_cmd = [sys.executable, os.path.join(THIS_DIR, 'update.py'),
                  '--bootstrap', '--force-local-build', '--run-tests']
+    if args.gcc_toolchain is not None:
+      build_cmd.extend(['--gcc-toolchain', args.gcc_toolchain])
     TeeCmd(build_cmd, log)
 
   stamp = open(STAMP_FILE).read().rstrip()
@@ -139,8 +146,6 @@
                  'lib/clang/*/lib/darwin/*profile_osx*',
                  ])
   elif sys.platform.startswith('linux'):
-    # Copy the stdlibc++.so.6 we linked Clang against so it can run.
-    want.append('lib/libstdc++.so.6')
     # Copy only
     # lib/clang/*/lib/linux/libclang_rt.{[atm]san,san,ubsan,profile}-*.a ,
     # but not dfsan.
@@ -155,6 +160,9 @@
                  'lib/clang/*/lib/windows/clang_rt.asan*.lib',
                  'lib/clang/*/include_sanitizer/*',
                  ])
+  if args.gcc_toolchain is not None:
+    # Copy the stdlibc++.so.6 we linked Clang against so it can run.
+    want.append('lib/libstdc++.so.6')
 
   for root, dirs, files in os.walk(LLVM_RELEASE_DIR):
     # root: third_party/llvm-build/Release+Asserts/lib/..., rel_root: lib/...