forked from mirrors/gecko-dev
Backout changesets 59c38e3958fe (bug 1485545) and 4017bcbb799d (bug 1485503) to give time to toolchains to build without blocking other landings.
This commit is contained in:
parent
660169ff88
commit
1894266228
4 changed files with 22 additions and 20 deletions
|
|
@ -1,15 +1,15 @@
|
|||
{
|
||||
"llvm_revision": "340494",
|
||||
"llvm_revision": "338869",
|
||||
"stages": "3",
|
||||
"build_libcxx": true,
|
||||
"build_type": "Release",
|
||||
"assertions": false,
|
||||
"llvm_repo": "https://llvm.org/svn/llvm-project/llvm/tags/RELEASE_700/rc2",
|
||||
"clang_repo": "https://llvm.org/svn/llvm-project/cfe/tags/RELEASE_700/rc2",
|
||||
"lld_repo": "https://llvm.org/svn/llvm-project/lld/tags/RELEASE_700/rc2",
|
||||
"compiler_repo": "https://llvm.org/svn/llvm-project/compiler-rt/tags/RELEASE_700/rc2",
|
||||
"libcxx_repo": "https://llvm.org/svn/llvm-project/libcxx/tags/RELEASE_700/rc2",
|
||||
"libcxxabi_repo": "https://llvm.org/svn/llvm-project/libcxxabi/tags/RELEASE_700/rc2",
|
||||
"llvm_repo": "https://llvm.org/svn/llvm-project/llvm/tags/RELEASE_700/rc1",
|
||||
"clang_repo": "https://llvm.org/svn/llvm-project/cfe/tags/RELEASE_700/rc1",
|
||||
"lld_repo": "https://llvm.org/svn/llvm-project/lld/tags/RELEASE_700/rc1",
|
||||
"compiler_repo": "https://llvm.org/svn/llvm-project/compiler-rt/tags/RELEASE_700/rc1",
|
||||
"libcxx_repo": "https://llvm.org/svn/llvm-project/libcxx/tags/RELEASE_700/rc1",
|
||||
"libcxxabi_repo": "https://llvm.org/svn/llvm-project/libcxxabi/tags/RELEASE_700/rc1",
|
||||
"python_path": "/usr/bin/python2.7",
|
||||
"gcc_dir": "/builds/worker/workspace/build/src/gcc",
|
||||
"cc": "/builds/worker/workspace/build/src/gcc/bin/gcc",
|
||||
|
|
@ -17,6 +17,7 @@
|
|||
"as": "/builds/worker/workspace/build/src/gcc/bin/gcc",
|
||||
"patches": [
|
||||
"find_symbolizer_linux.patch",
|
||||
"rename_gcov_flush.patch"
|
||||
"rename_gcov_flush.patch",
|
||||
"r339636.patch"
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,18 +1,21 @@
|
|||
{
|
||||
"llvm_revision": "340494",
|
||||
"llvm_revision": "338869",
|
||||
"stages": "3",
|
||||
"build_libcxx": true,
|
||||
"build_type": "Release",
|
||||
"assertions": false,
|
||||
"llvm_repo": "https://llvm.org/svn/llvm-project/llvm/tags/RELEASE_700/rc2",
|
||||
"clang_repo": "https://llvm.org/svn/llvm-project/cfe/tags/RELEASE_700/rc2",
|
||||
"lld_repo": "https://llvm.org/svn/llvm-project/lld/tags/RELEASE_700/rc2",
|
||||
"compiler_repo": "https://llvm.org/svn/llvm-project/compiler-rt/tags/RELEASE_700/rc2",
|
||||
"libcxx_repo": "https://llvm.org/svn/llvm-project/libcxx/tags/RELEASE_700/rc2",
|
||||
"libcxxabi_repo": "https://llvm.org/svn/llvm-project/libcxxabi/tags/RELEASE_700/rc2",
|
||||
"llvm_repo": "https://llvm.org/svn/llvm-project/llvm/tags/RELEASE_700/rc1",
|
||||
"clang_repo": "https://llvm.org/svn/llvm-project/cfe/tags/RELEASE_700/rc1",
|
||||
"lld_repo": "https://llvm.org/svn/llvm-project/lld/tags/RELEASE_700/rc1",
|
||||
"compiler_repo": "https://llvm.org/svn/llvm-project/compiler-rt/tags/RELEASE_700/rc1",
|
||||
"libcxx_repo": "https://llvm.org/svn/llvm-project/libcxx/tags/RELEASE_700/rc1",
|
||||
"libcxxabi_repo": "https://llvm.org/svn/llvm-project/libcxxabi/tags/RELEASE_700/rc1",
|
||||
"python_path": "/usr/bin/python2.7",
|
||||
"gcc_dir": "/builds/worker/workspace/build/src/gcc",
|
||||
"cc": "/builds/worker/workspace/build/src/gcc/bin/gcc",
|
||||
"cxx": "/builds/worker/workspace/build/src/gcc/bin/g++",
|
||||
"as": "/builds/worker/workspace/build/src/gcc/bin/gcc"
|
||||
"as": "/builds/worker/workspace/build/src/gcc/bin/gcc",
|
||||
"patches": [
|
||||
"r339636.patch"
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,9 +26,8 @@ mkdir -p $CROSSTOOLS_BUILD_DIR
|
|||
git clone --no-checkout $CROSSTOOL_PORT_REPOSITORY $CROSSTOOLS_SOURCE_DIR
|
||||
cd $CROSSTOOLS_SOURCE_DIR
|
||||
git checkout $CROSSTOOL_PORT_REV
|
||||
# Cherry pick two fixes for LTO.
|
||||
# Cherry pick a fix for LTO.
|
||||
git cherry-pick -n 82381f5038a340025ae145745ae5b325cd1b749a
|
||||
git cherry-pick -n 328c7371008a854af30823adcd4ec1e763054a1d
|
||||
echo "Building from commit hash `git rev-parse $CROSSTOOL_PORT_REV`..."
|
||||
|
||||
# Fetch clang from tooltool
|
||||
|
|
|
|||
|
|
@ -22,9 +22,8 @@ mkdir -p $CROSSTOOLS_BUILD_DIR
|
|||
git clone --no-checkout $CROSSTOOL_PORT_REPOSITORY $CROSSTOOLS_SOURCE_DIR
|
||||
cd $CROSSTOOLS_SOURCE_DIR
|
||||
git checkout $CROSSTOOL_PORT_REV
|
||||
# Cherry pick two fixes for LTO.
|
||||
# Cherry pick a fix for LTO.
|
||||
git cherry-pick -n 82381f5038a340025ae145745ae5b325cd1b749a
|
||||
git cherry-pick -n 328c7371008a854af30823adcd4ec1e763054a1d
|
||||
echo "Building from commit hash `git rev-parse $CROSSTOOL_PORT_REV`..."
|
||||
|
||||
# Fetch clang from tooltool
|
||||
|
|
|
|||
Loading…
Reference in a new issue