Bug 1262735 - Merge both clang-static-analysis-linux64*.json files. r?ehsan
Both point to the same path for cc and cxx, but not for gcc_dir, which
makes no sense. That's the only significant difference between both, so
just merge them both, and use the merged file in the taskcluster build
script.
deleted file mode 100644
--- a/build/build-clang/clang-static-analysis-linux64-centos6.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
- "llvm_revision": "247539",
- "stages": "3",
- "build_libcxx": false,
- "build_type": "Release",
- "assertions": false,
- "llvm_repo": "https://llvm.org/svn/llvm-project/llvm/trunk",
- "clang_repo": "https://llvm.org/svn/llvm-project/cfe/trunk",
- "compiler_repo": "https://llvm.org/svn/llvm-project/compiler-rt/trunk",
- "libcxx_repo": "https://llvm.org/svn/llvm-project/libcxx/trunk",
- "python_path": "/usr/bin/python2.7",
- "gcc_dir": "/home/worker/workspace/build/src/gcc",
- "cc": "/home/worker/workspace/build/src/gcc/bin/gcc",
- "cxx": "/home/worker/workspace/build/src/gcc/bin/g++",
- "patches": {
- "macosx64": [
- "llvm-debug-frame.patch",
- "query-selector-visibility.patch",
- "return-empty-string-non-mangled.patch"
- ],
- "linux64": [
- "llvm-debug-frame.patch",
- "query-selector-visibility.patch",
- "return-empty-string-non-mangled.patch"
- ],
- "linux32": [
- "llvm-debug-frame.patch",
- "query-selector-visibility.patch",
- "return-empty-string-non-mangled.patch"
- ]
- }
-}
--- a/build/build-clang/clang-static-analysis-linux64.json
+++ b/build/build-clang/clang-static-analysis-linux64.json
@@ -3,18 +3,18 @@
"stages": "3",
"build_libcxx": false,
"build_type": "Release",
"assertions": false,
"llvm_repo": "https://llvm.org/svn/llvm-project/llvm/trunk",
"clang_repo": "https://llvm.org/svn/llvm-project/cfe/trunk",
"compiler_repo": "https://llvm.org/svn/llvm-project/compiler-rt/trunk",
"libcxx_repo": "https://llvm.org/svn/llvm-project/libcxx/trunk",
- "python_path": "/usr/local/bin/python2.7",
- "gcc_dir": "/tools/gcc-4.7.3-0moz1",
+ "python_path": "/usr/bin/python2.7",
+ "gcc_dir": "/home/worker/workspace/build/src/gcc",
"cc": "/home/worker/workspace/build/src/gcc/bin/gcc",
"cxx": "/home/worker/workspace/build/src/gcc/bin/g++",
"patches": {
"macosx64": [
"llvm-debug-frame.patch",
"query-selector-visibility.patch",
"return-empty-string-non-mangled.patch"
],
--- a/testing/taskcluster/scripts/misc/build-clang-linux.sh
+++ b/testing/taskcluster/scripts/misc/build-clang-linux.sh
@@ -15,15 +15,15 @@ chmod +x tooltool.py
export TOOLTOOL_CACHE
cd src
$HOME_DIR/tooltool.py -m browser/config/tooltool-manifests/linux64/releng.manifest fetch
# gets a bit too verbose here
set +x
cd build/build-clang
-./build-clang.py -c clang-static-analysis-linux64-centos6.json
+./build-clang.py -c clang-static-analysis-linux64.json
set -x
# Put a tarball in the artifacts dir
mkdir -p $UPLOAD_DIR
cp clang.tar.* $UPLOAD_DIR
