From 41a3fbb5338b1b3536ef9ac7cdadc549e53a0a51 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 19 Jan 2018 19:41:59 +0100 Subject: [PATCH] dev-util/lldb: Pass test options only if tests are enabled --- dev-util/lldb/lldb-6.0.9999.ebuild | 9 +++++---- dev-util/lldb/lldb-9999.ebuild | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dev-util/lldb/lldb-6.0.9999.ebuild b/dev-util/lldb/lldb-6.0.9999.ebuild index 0eed0f615c43..2fb31177cc4b 100644 --- a/dev-util/lldb/lldb-6.0.9999.ebuild +++ b/dev-util/lldb/lldb-6.0.9999.ebuild @@ -71,10 +71,6 @@ src_configure() { -DLLVM_ENABLE_TERMINFO=$(usex ncurses) -DLLDB_INCLUDE_TESTS=$(usex test) - -DLLVM_BUILD_TESTS=$(usex test) - # compilers for lit tests - -DLLDB_TEST_C_COMPILER="$(type -P clang)" - -DLLDB_TEST_CXX_COMPILER="$(type -P clang++)" # TODO: fix upstream to detect this properly -DHAVE_LIBDL=ON @@ -87,6 +83,11 @@ src_configure() { -DCURSES_NEED_NCURSES=ON ) use test && mycmakeargs+=( + -DLLVM_BUILD_TESTS=$(usex test) + # compilers for lit tests + -DLLDB_TEST_C_COMPILER="$(type -P clang)" + -DLLDB_TEST_CXX_COMPILER="$(type -P clang++)" + -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" -DLLVM_LIT_ARGS="-vv" diff --git a/dev-util/lldb/lldb-9999.ebuild b/dev-util/lldb/lldb-9999.ebuild index ac9fc4b1211f..405a88ed3c33 100644 --- a/dev-util/lldb/lldb-9999.ebuild +++ b/dev-util/lldb/lldb-9999.ebuild @@ -70,10 +70,6 @@ src_configure() { -DLLVM_ENABLE_TERMINFO=$(usex ncurses) -DLLDB_INCLUDE_TESTS=$(usex test) - -DLLVM_BUILD_TESTS=$(usex test) - # compilers for lit tests - -DLLDB_TEST_C_COMPILER="$(type -P clang)" - -DLLDB_TEST_CXX_COMPILER="$(type -P clang++)" # TODO: fix upstream to detect this properly -DHAVE_LIBDL=ON @@ -86,6 +82,11 @@ src_configure() { -DCURSES_NEED_NCURSES=ON ) use test && mycmakeargs+=( + -DLLVM_BUILD_TESTS=$(usex test) + # compilers for lit tests + -DLLDB_TEST_C_COMPILER="$(type -P clang)" + -DLLDB_TEST_CXX_COMPILER="$(type -P clang++)" + -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" -DLLVM_LIT_ARGS="-vv" -- 2.26.2