rocmPackages.llvm: replace --replace with --replace-fail (cleanup)

+15 -15
+1 -1
pkgs/development/rocm-modules/6/llvm/base.nix
··· 150 150 rm unittests/Support/Path.cpp 151 151 152 152 substituteInPlace unittests/Support/CMakeLists.txt \ 153 - --replace "Path.cpp" "" 153 + --replace-fail "Path.cpp" "" 154 154 '' + extraPostPatch; 155 155 156 156 doCheck = buildTests;
+1 -1
pkgs/development/rocm-modules/6/llvm/stage-1/clang-unwrapped.nix
··· 21 21 ln -s ../cmake/Modules/FindLibEdit.cmake cmake/modules 22 22 23 23 substituteInPlace CMakeLists.txt \ 24 - --replace "include(CheckIncludeFile)" "include(CheckIncludeFile)''\nfind_package(LibEdit)" 24 + --replace-fail "include(CheckIncludeFile)" "include(CheckIncludeFile)''\nfind_package(LibEdit)" 25 25 26 26 # `No such file or directory: '/build/source/clang/tools/scan-build/bin/scan-build'` 27 27 rm test/Analysis/scan-build/*.test
+5 -5
pkgs/development/rocm-modules/6/llvm/stage-2/libc.nix
··· 14 14 # `Failed to match ... against ...` `Match value not within tolerance value of MPFR result:` 15 15 # We need a better way, but I don't know enough sed magic and patching `CMakeLists.txt` isn't working... 16 16 substituteInPlace ../libc/test/src/math/log10_test.cpp \ 17 - --replace "i < N" "i < 0" \ 18 - --replace "test(mpfr::RoundingMode::Nearest);" "" \ 19 - --replace "test(mpfr::RoundingMode::Downward);" "" \ 20 - --replace "test(mpfr::RoundingMode::Upward);" "" \ 21 - --replace "test(mpfr::RoundingMode::TowardZero);" "" 17 + --replace-fail "i < N" "i < 0" \ 18 + --replace-fail "test(mpfr::RoundingMode::Nearest);" "" \ 19 + --replace-fail "test(mpfr::RoundingMode::Downward);" "" \ 20 + --replace-fail "test(mpfr::RoundingMode::Upward);" "" \ 21 + --replace-fail "test(mpfr::RoundingMode::TowardZero);" "" 22 22 ''; 23 23 24 24 checkTargets = [ "check-${targetName}" ];
+1 -1
pkgs/development/rocm-modules/6/llvm/stage-3/clang.nix
··· 68 68 69 69 # GPU compilation uses builtin `lld` 70 70 substituteInPlace $out/bin/{clang,clang++} \ 71 - --replace "-MM) dontLink=1 ;;" "-MM | --cuda-device-only) dontLink=1 ;;''\n--cuda-host-only | --cuda-compile-host-device) dontLink=0 ;;" 71 + --replace-fail "-MM) dontLink=1 ;;" "-MM | --cuda-device-only) dontLink=1 ;;''\n--cuda-host-only | --cuda-compile-host-device) dontLink=0 ;;" 72 72 ''; 73 73 }
+5 -5
pkgs/development/rocm-modules/6/llvm/stage-3/libclc.nix
··· 21 21 # `clspv` tests fail, unresolved calls 22 22 extraPostPatch = '' 23 23 substituteInPlace CMakeLists.txt \ 24 - --replace "find_program( LLVM_CLANG clang PATHS \''${LLVM_BINDIR} NO_DEFAULT_PATH )" \ 24 + --replace-fail "find_program( LLVM_CLANG clang PATHS \''${LLVM_BINDIR} NO_DEFAULT_PATH )" \ 25 25 "find_program( LLVM_CLANG clang PATHS \"${clang}/bin\" NO_DEFAULT_PATH )" \ 26 - --replace "find_program( LLVM_SPIRV llvm-spirv PATHS \''${LLVM_BINDIR} NO_DEFAULT_PATH )" \ 26 + --replace-fail "find_program( LLVM_SPIRV llvm-spirv PATHS \''${LLVM_BINDIR} NO_DEFAULT_PATH )" \ 27 27 "find_program( LLVM_SPIRV llvm-spirv PATHS \"${spirv}/bin\" NO_DEFAULT_PATH )" \ 28 - --replace " spirv-mesa3d-" "" \ 29 - --replace " spirv64-mesa3d-" "" \ 30 - --replace "NOT \''${t} MATCHES" \ 28 + --replace-fail " spirv-mesa3d-" "" \ 29 + --replace-fail " spirv64-mesa3d-" "" \ 30 + --replace-fail "NOT \''${t} MATCHES" \ 31 31 "NOT \''${ARCH} STREQUAL \"clspv\" AND NOT \''${ARCH} STREQUAL \"clspv64\" AND NOT \''${t} MATCHES" 32 32 ''; 33 33
+1 -1
pkgs/development/rocm-modules/6/llvm/stage-3/mlir.nix
··· 45 45 extraPostPatch = '' 46 46 # `add_library cannot create target "llvm_gtest" because an imported target with the same name already exists` 47 47 substituteInPlace CMakeLists.txt \ 48 - --replace "EXISTS \''${UNITTEST_DIR}/googletest/include/gtest/gtest.h" "FALSE" 48 + --replace-fail "EXISTS \''${UNITTEST_DIR}/googletest/include/gtest/gtest.h" "FALSE" 49 49 50 50 # Mainly `No such file or directory` 51 51 cat ${./1001-mlir-failing-tests.list} | xargs -d \\n rm
+1 -1
pkgs/development/rocm-modules/6/llvm/stage-3/polly.nix
··· 11 11 extraPostPatch = '' 12 12 # `add_library cannot create target "llvm_gtest" because an imported target with the same name already exists` 13 13 substituteInPlace CMakeLists.txt \ 14 - --replace "NOT TARGET gtest" "FALSE" 14 + --replace-fail "NOT TARGET gtest" "FALSE" 15 15 ''; 16 16 17 17 checkTargets = [ "check-${targetName}" ];