Skip to content

Commit

Permalink
llvmPackages_git.llvm: adjust a path, skip an xfail test on darwin
Browse files Browse the repository at this point in the history
Port of 0ee5251 ("llvmPackages_15.llvm:
adjust a path, skip an xfail test on darwin")
  • Loading branch information
rrbutani authored and RaitoBezarius committed Mar 26, 2023
1 parent 0da4072 commit 3f9a9ad
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions pkgs/development/compilers/llvm/git/llvm/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
, runCommand
, fetchpatch
, cmake
, darwin
, ninja
, python3
, libffi
Expand Down Expand Up @@ -144,6 +145,14 @@ in stdenv.mkDerivation (rec {
substituteInPlace cmake/modules/AddLLVM.cmake \
--replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \
--replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' ""
# As of LLVM 15, marked as XFAIL on arm64 macOS but lit doesn't seem to pick
# this up: https://github.com/llvm/llvm-project/blob/c344d97a125b18f8fed0a64aace73c49a870e079/llvm/test/MC/ELF/cfi-version.ll#L7
rm test/MC/ELF/cfi-version.ll
# This test tries to call `sw_vers` by absolute path (`/usr/bin/sw_vers`)
# thus fails under the sandbox:
substituteInPlace unittests/Support/Host.cpp \
--replace '/usr/bin/sw_vers' "${(builtins.toString darwin.DarwinTools) + "/bin/sw_vers" }"
'' + ''
# FileSystem permissions tests fail with various special bits
substituteInPlace unittests/Support/CMakeLists.txt \
Expand Down

0 comments on commit 3f9a9ad

Please sign in to comment.