--- a/build/build-clang/build-clang.py
+++ b/build/build-clang/build-clang.py
@@ -339,18 +339,18 @@ if __name__ == "__main__":
     if is_darwin():
         extra_cflags = []
         extra_cxxflags = ["-stdlib=libc++"]
         extra_cflags2 = []
         extra_cxxflags2 = ["-stdlib=libc++"]
     elif is_linux():
         extra_cflags = ["-static-libgcc"]
         extra_cxxflags = ["-static-libgcc", "-static-libstdc++"]
-        extra_cflags2 = ["-fPIC", "--gcc-toolchain=%s" % gcc_dir]
-        extra_cxxflags2 = ["-fPIC", "--gcc-toolchain=%s" % gcc_dir]
+        extra_cflags2 = ["-fPIC"]
+        extra_cxxflags2 = ["-fPIC"]
 
         if os.environ.has_key('LD_LIBRARY_PATH'):
             os.environ['LD_LIBRARY_PATH'] = '%s/lib64/:%s' % (gcc_dir, os.environ['LD_LIBRARY_PATH']);
         else:
             os.environ['LD_LIBRARY_PATH'] = '%s/lib64/' % gcc_dir
     elif is_windows():
         extra_cflags = []
         extra_cxxflags = []
@@ -358,38 +358,44 @@ if __name__ == "__main__":
         extra_cxxflags2 = []
 
     build_one_stage(
         [cc] + extra_cflags,
         [cxx] + extra_cxxflags,
         llvm_source_dir, stage1_dir, build_libcxx,
         build_type, assertions, python_path)
 
+    if is_linux():
+        install_libgcc(gcc_dir, final_stage_dir + '/clang')
+
     if stages > 1:
         stage2_dir = build_dir + '/stage2'
         stage2_inst_dir = stage2_dir + '/clang'
         final_stage_dir = stage2_dir
         build_one_stage(
             [stage1_inst_dir + "/bin/%s%s" %
                 (cc_name, exe_ext)] + extra_cflags2,
             [stage1_inst_dir + "/bin/%s%s" %
                 (cxx_name, exe_ext)] + extra_cxxflags2,
             llvm_source_dir, stage2_dir, build_libcxx,
             build_type, assertions, python_path)
 
-        if stages > 2:
-            stage3_dir = build_dir + '/stage3'
-            final_stage_dir = stage3_dir
-            build_one_stage(
-                [stage2_inst_dir + "/bin/%s%s" %
-                    (cc_name, exe_ext)] + extra_cflags2,
-                [stage2_inst_dir + "/bin/%s%s" %
-                    (cxx_name, exe_ext)] + extra_cxxflags2,
-                llvm_source_dir, stage3_dir, build_libcxx,
-                build_type, assertions, python_path)
+        if is_linux():
+            install_libgcc(gcc_dir, final_stage_dir + '/clang')
 
-    if is_linux():
-        install_libgcc(gcc_dir, final_stage_dir + '/clang')
+    if stages > 2:
+        stage3_dir = build_dir + '/stage3'
+        final_stage_dir = stage3_dir
+        build_one_stage(
+            [stage2_inst_dir + "/bin/%s%s" %
+                (cc_name, exe_ext)] + extra_cflags2,
+            [stage2_inst_dir + "/bin/%s%s" %
+                (cxx_name, exe_ext)] + extra_cxxflags2,
+            llvm_source_dir, stage3_dir, build_libcxx,
+            build_type, assertions, python_path)
+
+        if is_linux():
+            install_libgcc(gcc_dir, final_stage_dir + '/clang')
 
     if is_darwin() or is_windows():
         build_tar_package("tar", "clang.tar.bz2", final_stage_dir, "clang")
     else:
         build_tar_package("tar", "clang.tar.xz", final_stage_dir, "clang")