From fccf04b6200b711977dbfe9a59e3356bfe768932 Mon Sep 17 00:00:00 2001 From: Sandro Jäckel Date: Sun, 23 Jul 2023 23:45:18 +0200 Subject: treewide: replace -DCMAKE_BUILD_TYPE in cmakeFlags with cmakeBuildType --- pkgs/development/compilers/llvm/15/llvm/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs/development/compilers/llvm/15/llvm/default.nix') diff --git a/pkgs/development/compilers/llvm/15/llvm/default.nix b/pkgs/development/compilers/llvm/15/llvm/default.nix index 7742fc0a186..e6f339ff6d6 100644 --- a/pkgs/development/compilers/llvm/15/llvm/default.nix +++ b/pkgs/development/compilers/llvm/15/llvm/default.nix @@ -298,6 +298,8 @@ in stdenv.mkDerivation (rec { # E.g. mesa.drivers use the build-id as a cache key (see #93946): LDFLAGS = optionalString (enableSharedLibraries && !stdenv.isDarwin) "-Wl,--build-id=sha1"; + cmakeBuildType = if debugVersion then "Debug" else "Release"; + cmakeFlags = with stdenv; let # These flags influence llvm-config's BuildVariables.inc in addition to the # general build. We need to make sure these are also passed via @@ -313,7 +315,6 @@ in stdenv.mkDerivation (rec { "-DLLVM_LINK_LLVM_DYLIB=ON" ]; in flagsForLlvmConfig ++ [ - "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc "-DLLVM_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" "-DLLVM_ENABLE_FFI=ON" -- cgit 1.4.1 From 23375e823183abfcb4a6ba24b2487a2830a23313 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 17 Sep 2023 16:48:33 +0100 Subject: llvmPackages_15.llvm: skip googletest-timeout lit test timing-based tests can cause trouble on loaded or slow machines --- pkgs/development/compilers/llvm/15/llvm/default.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs/development/compilers/llvm/15/llvm/default.nix') diff --git a/pkgs/development/compilers/llvm/15/llvm/default.nix b/pkgs/development/compilers/llvm/15/llvm/default.nix index 7742fc0a186..c7c145c745a 100644 --- a/pkgs/development/compilers/llvm/15/llvm/default.nix +++ b/pkgs/development/compilers/llvm/15/llvm/default.nix @@ -227,6 +227,8 @@ in stdenv.mkDerivation (rec { --replace "PassBuilderCallbacksTest.cpp" "" rm unittests/IR/PassBuilderCallbacksTest.cpp rm test/tools/llvm-objcopy/ELF/mirror-permissions-unix.test + # timing-based tests are trouble + rm utils/lit/tests/googletest-timeout.py '' + optionalString stdenv.hostPlatform.isMusl '' patch -p1 -i ${../../TLI-musl.patch} substituteInPlace unittests/Support/CMakeLists.txt \ -- cgit 1.4.1