Bug 1262735 - Merge both clang-static-analysis-linux64*.json files. r=ehsan
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 08 Apr 2016 13:30:40 +0900
changeset 330796 8a41989bd1b44c2bb2efc262f46e529bac146e6c
parent 330795 db468dad3a35866dc24a45f2b9cbd744e2b9f77e
child 330797 17cb8c4b18b48c8958a2a2eff56ad23e8bd23d11
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersehsan
bugs1262735
milestone48.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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.
build/build-clang/clang-static-analysis-linux64-centos6.json
build/build-clang/clang-static-analysis-linux64.json
testing/taskcluster/scripts/misc/build-clang-linux.sh
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