diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-04-05 21:52:00 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-04-05 21:52:00 +0100 |
| commit | 2d446203bcf1a0db08e99abca43513d246dfa73d (patch) | |
| tree | ec623bb5f1f389976977e375342ec59ff441eab7 /sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild | |
| parent | 171a011ad3a131671aeb5a98b9e3adf219ad2865 (diff) | |
gentoo resync : 05.04.2018
Diffstat (limited to 'sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild')
| -rw-r--r-- | sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild index 2dc0d7cb40bd..00662c398d63 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild @@ -28,7 +28,7 @@ DEPEND=" >=sys-devel/llvm-4 clang? ( sys-devel/clang ) test? ( - app-portage/unsandbox + !<sys-apps/sandbox-2.13 $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} sys-libs/compiler-rt:${SLOT} ) @@ -106,9 +106,18 @@ src_configure() { -DCOMPILER_RT_BUILD_XRAY=ON ) if use test; then + if has_version '>=sys-devel/llvm-6'; then + mycmakeargs+=( + -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" + ) + else + mycmakeargs+=( + -DLIT_COMMAND="${EPREFIX}"/usr/bin/lit + ) + fi + mycmakeargs+=( -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" - -DLIT_COMMAND="${EPREFIX}/usr/bin/unsandbox;${EPREFIX}/usr/bin/lit" # they are created during src_test() -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang" @@ -149,6 +158,10 @@ src_configure() { src_test() { # respect TMPDIR! local -x LIT_PRESERVES_TMP=1 + # disable sandbox to have it stop clobbering LD_PRELOAD + local -x SANDBOX_ON=0 + # wipe LD_PRELOAD to make ASAN happy + local -x LD_PRELOAD= cmake-utils_src_make check-all } |