corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1262735 - Copy libgcc from the GCC used to build clang instead of building a new GCC. r=ehsan

Browse Source 
Since build-clang.py requires a gcc_dir to be set, and we're using GCC
from there to build clang, we might as well copy libgcc from there
instead of building a fresh GCC. On the taskcluster job building clang,
GCC comes from a tooltool package that is already the result of
build-gcc anyways.
This commit is contained in:
Mike Hommey
2016-04-08 13:14:07 +09:00
parent a3f980d620
commit 002db5c8cc
1 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
build/build-clang/build-clang.py
View File

@@ -114,29 +114,21 @@ def mkdir_p(path):
raise raise
def build_and_use_libgcc(env, clang_dir): def install_libgcc(gcc_dir, clang_dir):
with updated_env(env): libgcc_dir = glob.glob(os.path.join(gcc_dir, "lib", "gcc",
tempdir = tempfile.mkdtemp() "x86_64-*linux-gnu",
gcc_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)),
"..", "unix", "build-gcc")
run_in(gcc_dir, ["./build-gcc.sh", tempdir, "libgcc"])
run_in(tempdir, ["tar", "-xf", "gcc.tar.xz"])
libgcc_dir = glob.glob(os.path.join(tempdir,
"gcc", "lib", "gcc",
"x86_64-unknown-linux-gnu",
"[0-9]*"))[0] "[0-9]*"))[0]
clang_lib_dir = os.path.join(clang_dir, "lib", "gcc", clang_lib_dir = os.path.join(clang_dir, "lib", "gcc",
"x86_64-unknown-linux-gnu", "x86_64-unknown-linux-gnu",
os.path.basename(libgcc_dir)) os.path.basename(libgcc_dir))
mkdir_p(clang_lib_dir) mkdir_p(clang_lib_dir)
copy_dir_contents(libgcc_dir, clang_lib_dir) copy_dir_contents(libgcc_dir, clang_lib_dir)
libgcc_dir = os.path.join(tempdir, "gcc", "lib64") libgcc_dir = os.path.join(gcc_dir, "lib64")
clang_lib_dir = os.path.join(clang_dir, "lib") clang_lib_dir = os.path.join(clang_dir, "lib")
copy_dir_contents(libgcc_dir, clang_lib_dir) copy_dir_contents(libgcc_dir, clang_lib_dir)
include_dir = os.path.join(tempdir, "gcc", "include") include_dir = os.path.join(gcc_dir, "include")
clang_include_dir = os.path.join(clang_dir, "include") clang_include_dir = os.path.join(clang_dir, "include")
copy_dir_contents(include_dir, clang_include_dir) copy_dir_contents(include_dir, clang_include_dir)
shutil.rmtree(tempdir)
def svn_co(source_dir, url, directory, revision): def svn_co(source_dir, url, directory, revision):
@@ -395,11 +387,7 @@ if __name__ == "__main__":
build_type, assertions, python_path) build_type, assertions, python_path)
if is_linux(): if is_linux():
final_stage_inst_dir = final_stage_dir + '/clang' install_libgcc(gcc_dir, final_stage_dir + '/clang')
build_and_use_libgcc(
{"CC": cc + " %s" % ' '.join(extra_cflags),
"CXX": cxx + " %s" % ' '.join(extra_cxxflags)},
final_stage_inst_dir)
if is_darwin() or is_windows(): if is_darwin() or is_windows():
build_tar_package("tar", "clang.tar.bz2", final_stage_dir, "clang") build_tar_package("tar", "clang.tar.bz2", final_stage_dir, "clang")