Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1415568 - Support applying patches to Windows clang. r=froydnj

Browse Source 
--HG--
extra : rebase_source : ed53f564166f6c26ed4f7fc0dabcc4582116ddbf
This commit is contained in:
Marco Castelluccio 2017-11-08 17:23:12 +01:00
parent 52ce8728f8
commit 14a1047ffd
5 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -456,15 +456,15 @@ if __name__ == "__main__":
for p in config.get("patches", []):
patch(p, source_dir)
symlinks = [(source_dir + "/clang",
symlinks = [(clang_source_dir,
llvm_source_dir + "/tools/clang"),
(source_dir + "/extra",
(extra_source_dir,
llvm_source_dir + "/tools/clang/tools/extra"),
(source_dir + "/compiler-rt",
(compiler_rt_source_dir,
llvm_source_dir + "/projects/compiler-rt"),
(source_dir + "/libcxx",
(libcxx_source_dir,
llvm_source_dir + "/projects/libcxx"),
(source_dir + "/libcxxabi",
(libcxxabi_source_dir,
llvm_source_dir + "/projects/libcxxabi")]
for l in symlinks:
# On Windows, we have to re-copy the whole directory every time.

4
build/build-clang/clang-win32.json
View File

@ -12,7 +12,7 @@
"cc": "cl.exe",
"cxx": "cl.exe",
"patches": [
"build/src/build/build-clang/msvc-host-x64.patch",
"build/src/build/build-clang/loosen-msvc-detection.patch"
"msvc-host-x64.patch",
"loosen-msvc-detection.patch"
]
}

2
build/build-clang/clang-win64.json
View File

@ -13,6 +13,6 @@
"cxx": "cl.exe",
"ml": "ml64.exe",
"patches": [
"build/src/build/build-clang/loosen-msvc-detection.patch"
"loosen-msvc-detection.patch"
]
}

6
taskcluster/scripts/misc/build-clang-windows-helper32.sh
View File

@ -47,11 +47,13 @@ EOF
set +x
BUILD_CLANG_DIR=build/src/build/build-clang
MOZCONFIG=${MOZCONFIG} build/src/mach python ${BUILD_CLANG_DIR}/build-clang.py -c ${BUILD_CLANG_DIR}/${1}
cd ${BUILD_CLANG_DIR}
MOZCONFIG=${MOZCONFIG} ../../mach python ./build-clang.py -c ./${1}
cd -
set -x
# Put a tarball in the artifacts dir
UPLOAD_PATH=public/build
mkdir -p ${UPLOAD_PATH}
cp clang*.tar.* ${UPLOAD_PATH}
cp ${BUILD_CLANG_DIR}/clang*.tar.* ${UPLOAD_PATH}

7
taskcluster/scripts/misc/build-clang-windows-helper64.sh
View File

@ -46,11 +46,14 @@ EOF
set +x
BUILD_CLANG_DIR=build/src/build/build-clang
MOZCONFIG=${MOZCONFIG} build/src/mach python ${BUILD_CLANG_DIR}/build-clang.py -c ${BUILD_CLANG_DIR}/${1}
cd ${BUILD_CLANG_DIR}
MOZCONFIG=${MOZCONFIG} ../../mach python ./build-clang.py -c ./${1}
cd -
set -x
# Put a tarball in the artifacts dir
UPLOAD_PATH=public/build
mkdir -p ${UPLOAD_PATH}
cp clang*.tar.* ${UPLOAD_PATH}
cp ${BUILD_CLANG_DIR}/clang*.tar.* ${UPLOAD_PATH}