mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Backed out changeset 7652cf6fa0e4 (bug 1492663) for static analysis bustage 

--HG--
rename : build/build-clang/clang-7-macosx64.json => build/build-clang/clang-6-macosx64.json
rename : taskcluster/scripts/misc/build-clang-7-linux-macosx-cross.sh => taskcluster/scripts/misc/build-clang-6-linux-macosx-cross.sh
This commit is contained in:
Coroiu Cristina 2018-09-30 10:09:19 +03:00
Родитель 9809b1f863
Коммит 44102e9f3d
8 изменённых файлов: 30 добавлений и 29 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
build/build-clang/build-clang.py
Просмотреть файл

@ -235,8 +235,6 @@ def build_one_stage(cc, cxx, asm, ld, ar, ranlib, libtool,
"-DCMAKE_SYSTEM_NAME=Darwin",
"-DCMAKE_SYSTEM_VERSION=10.10",
"-DLLVM_ENABLE_THREADS=OFF",
# Xray requires a OSX 10.12 SDK (https://bugs.llvm.org/show_bug.cgi?id=38959)
"-DCOMPILER_RT_BUILD_XRAY=OFF",
"-DLIBCXXABI_LIBCXX_INCLUDES=%s" % libcxx_include_dir,
"-DCMAKE_OSX_SYSROOT=%s" % slashify_path(os.getenv("CROSS_SYSROOT")),
"-DCMAKE_FIND_ROOT_PATH=%s" % slashify_path(os.getenv("CROSS_CCTOOLS_PATH")), # noqa

19
build/build-clang/clang-7-macosx64.json → build/build-clang/clang-6-macosx64.json
Просмотреть файл

@ -1,16 +1,16 @@
{
"llvm_revision": "342383",
"llvm_revision": "335538",
"stages": "1",
"build_libcxx": true,
"build_type": "Release",
"assertions": false,
"osx_cross_compile": true,
"llvm_repo": "https://llvm.org/svn/llvm-project/llvm/tags/RELEASE_700/final",
"clang_repo": "https://llvm.org/svn/llvm-project/cfe/tags/RELEASE_700/final",
"lld_repo": "https://llvm.org/svn/llvm-project/lld/tags/RELEASE_700/final",
"compiler_repo": "https://llvm.org/svn/llvm-project/compiler-rt/tags/RELEASE_700/final",
"libcxx_repo": "https://llvm.org/svn/llvm-project/libcxx/tags/RELEASE_700/final",
"libcxxabi_repo": "https://llvm.org/svn/llvm-project/libcxxabi/tags/RELEASE_700/final",
"llvm_repo": "https://llvm.org/svn/llvm-project/llvm/tags/RELEASE_601/final",
"clang_repo": "https://llvm.org/svn/llvm-project/cfe/tags/RELEASE_601/final",
"lld_repo": "https://llvm.org/svn/llvm-project/lld/tags/RELEASE_601/final",
"compiler_repo": "https://llvm.org/svn/llvm-project/compiler-rt/tags/RELEASE_601/final",
"libcxx_repo": "https://llvm.org/svn/llvm-project/libcxx/tags/RELEASE_601/final",
"libcxxabi_repo": "https://llvm.org/svn/llvm-project/libcxxabi/tags/RELEASE_601/final",
"python_path": "/usr/bin/python2.7",
"gcc_dir": "/builds/worker/workspace/build/src/gcc",
"cc": "/builds/worker/workspace/build/src/clang/bin/clang",
@ -23,6 +23,9 @@
"patches": [
"static-llvm-symbolizer.patch",
"compiler-rt-cross-compile.patch",
"compiler-rt-no-codesign.patch"
"compiler-rt-no-codesign.patch",
"r322401.patch",
"r325356.patch",
"r339636.patch"
]
}

6
build/build-clang/compiler-rt-no-codesign.patch
Просмотреть файл

@ -2,9 +2,9 @@ Disable codesign for macosx cross-compile toolchain. Codesign only works on OSX.
Index: cmake/Modules/AddCompilerRT.cmake
===================================================================
--- a/compiler-rt/cmake/Modules/AddCompilerRT.cmake (revision 342374)
--- a/compiler-rt/cmake/Modules/AddCompilerRT.cmake (revision 312553)
+++ b/compiler-rt/cmake/Modules/AddCompilerRT.cmake (working copy)
@@ -290,14 +290,6 @@
@@ -224,14 +224,6 @@
set_target_properties(${libname} PROPERTIES IMPORT_PREFIX "")
set_target_properties(${libname} PROPERTIES IMPORT_SUFFIX ".lib")
endif()
@ -18,4 +18,4 @@ Index: cmake/Modules/AddCompilerRT.cmake
- endif()
endif()
install(TARGETS ${libname}
ARCHIVE DESTINATION ${install_dir_${libname}}
ARCHIVE DESTINATION ${COMPILER_RT_LIBRARY_INSTALL_DIR}

16
taskcluster/ci/toolchain/linux.yml
Просмотреть файл

@ -44,6 +44,7 @@ linux64-clang-6:
- 'build/build-clang/build-clang.py'
- 'build/build-clang/clang-6-linux64.json'
- 'taskcluster/scripts/misc/tooltool-download.sh'
toolchain-alias: linux64-clang
toolchain-artifact: public/build/clang.tar.xz
toolchains:
- linux64-gcc-4.9
@ -65,7 +66,6 @@ linux64-clang-7:
- 'build/build-clang/build-clang.py'
- 'build/build-clang/clang-7-linux64.json'
- 'taskcluster/scripts/misc/tooltool-download.sh'
toolchain-alias: linux64-clang
toolchain-artifact: public/build/clang.tar.xz
toolchains:
- linux64-gcc-4.9
@ -118,12 +118,12 @@ linux64-clang-7-mingw-x64:
toolchains:
- linux64-gcc-4.9
linux64-clang-7-macosx-cross:
description: "Clang 7 toolchain build with MacOS Compiler RT libs"
linux64-clang-6-macosx-cross:
description: "Clang 6 toolchain build with MacOS Compiler RT libs"
treeherder:
kind: build
platform: toolchains/opt
symbol: TL(clang7-macosx-cross)
symbol: TL(clang6-macosx-cross)
tier: 1
worker-type: aws-provisioner-v1/gecko-{level}-b-linux
worker:
@ -132,17 +132,17 @@ linux64-clang-7-macosx-cross:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-clang.manifest"
run:
using: toolchain-script
script: build-clang-7-linux-macosx-cross.sh
script: build-clang-6-linux-macosx-cross.sh
resources:
- 'build/build-clang/build-clang.py'
- 'build/build-clang/clang-7-macosx64.json'
- 'build/build-clang/clang-6-macosx64.json'
- 'taskcluster/scripts/misc/tooltool-download.sh'
toolchain-alias: linux64-clang-macosx-cross
toolchain-artifact: public/build/clang.tar.xz
tooltool-downloads: internal
toolchains:
- linux64-cctools-port
- linux64-clang-7
- linux64-clang-6
- linux64-gcc-4.9
linux64-clang-tidy:
@ -354,7 +354,7 @@ linux64-cctools-port:
- 'taskcluster/scripts/misc/tooltool-download.sh'
toolchain-artifact: public/build/cctools.tar.xz
toolchains:
- linux64-clang-7
- linux64-clang-6
linux64-hfsplus:
description: "hfsplus toolchain build"

10
taskcluster/ci/toolchain/macosx.yml
Просмотреть файл

@ -27,12 +27,12 @@ macosx64-clang:
tooltool-downloads: internal
resources:
- 'build/build-clang/build-clang.py'
- 'build/build-clang/clang-7-macosx64.json'
- 'build/build-clang/clang-6-macosx64.json'
- 'taskcluster/scripts/misc/tooltool-download.sh'
toolchain-artifact: public/build/clang.tar.xz
toolchains:
- linux64-cctools-port
- linux64-clang-7
- linux64-clang-6
- linux64-gcc-4.9
- linux64-node
@ -63,7 +63,7 @@ macosx64-clang-tidy:
toolchain-artifact: public/build/clang-tidy.tar.xz
toolchains:
- linux64-cctools-port
- linux64-clang-7
- linux64-clang-6
- linux64-gcc-4.9
- linux64-node
@ -88,7 +88,7 @@ macosx64-cctools-port:
toolchain-artifact: public/build/cctools.tar.bz2
toolchains:
- linux64-cctools-port
- linux64-clang-7
- linux64-clang-6
- linux64-node
macosx64-gn:
@ -113,7 +113,7 @@ macosx64-gn:
toolchain-artifact: public/build/gn.tar.xz
toolchains:
- linux64-cctools-port
- linux64-clang-7
- linux64-clang-6
- linux64-node
macosx64-node:

2
taskcluster/scripts/misc/build-cctools-port.sh
Просмотреть файл

@ -48,7 +48,7 @@ export LDFLAGS="-lpthread -Wl,-rpath-link,$CLANG_DIR/lib"
make -j `nproc --all` install
strip $CROSSTOOLS_BUILD_DIR/bin/*
# cctools-port doesn't include dsymutil but clang will need to find it.
cp $CLANG_DIR/bin/dsymutil $CROSSTOOLS_BUILD_DIR/bin/x86_64-apple-darwin11-dsymutil
cp $CLANG_DIR/bin/llvm-dsymutil $CROSSTOOLS_BUILD_DIR/bin/x86_64-apple-darwin11-dsymutil
# Put a tarball in the artifacts dir
mkdir -p $UPLOAD_DIR

2
taskcluster/scripts/misc/build-clang-7-linux-macosx-cross.sh → taskcluster/scripts/misc/build-clang-6-linux-macosx-cross.sh
Просмотреть файл

@ -25,7 +25,7 @@ set +x
cd build/build-clang
# |mach python| sets up a virtualenv for us!
../../mach python ./build-clang.py -c clang-7-macosx64.json --skip-tar
../../mach python ./build-clang.py -c clang-6-macosx64.json --skip-tar
# We now have a native macosx64 toolchain.
# What we want is a native linux64 toolchain which can target macosx64 and use the sanitizer dylibs.

2
taskcluster/scripts/misc/build-clang-macosx.sh
Просмотреть файл

@ -24,7 +24,7 @@ set +x
cd build/build-clang
# |mach python| sets up a virtualenv for us!
../../mach python ./build-clang.py -c clang-7-macosx64.json
../../mach python ./build-clang.py -c clang-6-macosx64.json
set -x