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

Backed out changeset df39b3369446 (bug 1426176) for causing toolchains clang bustages. CLOSED TREE

Browse Source
This commit is contained in:
Cosmin Sabou
2018-07-31 00:48:47 +03:00
parent 6966b008ca
commit 5e57ad14db
2 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -134,21 +134,6 @@ def install_import_library(build_dir, clang_dir):
os.path.join(clang_dir, "lib")) os.path.join(clang_dir, "lib"))
def install_asan_symbols(build_dir, clang_dir):
lib_path_pattern = os.path.join("lib", "clang", "*.*.*", "lib", "windows")
src_path = glob.glob(os.path.join(build_dir, lib_path_pattern,
"clang_rt.asan_dynamic-x86_64.pdb"))
dst_path = glob.glob(os.path.join(clang_dir, lib_path_pattern))
if len(src_path) != 1:
raise Exception("Source path pattern did not resolve uniquely")
if len(src_path) != 1:
raise Exception("Destination path pattern did not resolve uniquely")
shutil.copy2(src_path[0], dst_path[0])
def svn_co(source_dir, url, directory, revision): def svn_co(source_dir, url, directory, revision):
run_in(source_dir, ["svn", "co", "-q", "-r", revision, url, directory]) run_in(source_dir, ["svn", "co", "-q", "-r", revision, url, directory])
@@ -241,7 +226,6 @@ def build_one_stage(cc, cxx, asm, ld, ar, ranlib, libtool,
# installed, so we copy it by ourselves. # installed, so we copy it by ourselves.
if is_windows(): if is_windows():
install_import_library(build_dir, inst_dir) install_import_library(build_dir, inst_dir)
install_asan_symbols(build_dir, inst_dir)
# Return the absolute path of a build tool. We first look to see if the # Return the absolute path of a build tool. We first look to see if the

1
build/moz.build
View File

@@ -50,7 +50,6 @@ OBJDIR_FILES += ['!/dist/bin/.gdbinit_python']
# Install the clang-cl runtime library for ASAN next to the binaries we produce. # Install the clang-cl runtime library for ASAN next to the binaries we produce.
if CONFIG['MOZ_ASAN'] and CONFIG['CC_TYPE'] == 'clang-cl': if CONFIG['MOZ_ASAN'] and CONFIG['CC_TYPE'] == 'clang-cl':
FINAL_TARGET_FILES += ['%' + CONFIG['MOZ_CLANG_RT_ASAN_LIB_PATH']] FINAL_TARGET_FILES += ['%' + CONFIG['MOZ_CLANG_RT_ASAN_LIB_PATH']]
FINAL_TARGET_FILES += ['%' + CONFIG['MOZ_CLANG_RT_ASAN_LIB_PATH'].replace(".dll", ".pdb")]
if CONFIG['LLVM_SYMBOLIZER']: if CONFIG['LLVM_SYMBOLIZER']:
FINAL_TARGET_FILES += ['/' + CONFIG['LLVM_SYMBOLIZER']] FINAL_TARGET_FILES += ['/' + CONFIG['LLVM_SYMBOLIZER']]