Bug 683975 - make lib a symlink to lib64.

--HG--
extra : rebase_source : 5118679596f0034ba0afe13c4be8e4bb973d4b77

build/unix/build-toolchain/build-gcc.py

@@ -92,7 +92,7 @@ def build_linux_headers_aux(inst_dir):
     run_in(linux_source_dir, [old_make, "headers_check"])
     run_in(linux_source_dir, [old_make, "INSTALL_HDR_PATH=dest",
                                "headers_install"])
-    shutil.move(linux_source_dir + "/dest", inst_dir)
+    shutil.move(linux_source_dir + "/dest/include", inst_dir + '/include')
 
 def build_linux_headers(inst_dir):
     def f():
@@ -151,6 +151,10 @@ def build_one_stage_aux(stage_dir, is_stage_one):
                    "--with-mpfr=%s" % lib_inst_dir])
 
     tool_inst_dir = stage_dir + '/inst'
+    os.mkdir(tool_inst_dir)
+    os.mkdir(tool_inst_dir + '/lib64')
+    os.symlink('lib64', tool_inst_dir + '/lib')
+
     build_linux_headers(tool_inst_dir)
 
     binutils_build_dir = stage_dir + '/binutils'