Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix infinite recursion on Darwin. #29

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix infinite recursion on Darwin. #29

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22a1422
Fix infinite recursion on Darwin.
matthewbauer Jan 27, 2019
c66daf9
Set install name correctly for LLVM.
matthewbauer Jan 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 12 additions & 19 deletions llvm-head/llvm.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ in stdenv.mkDerivation rec {

outputs = ["out"] ++ stdenv.lib.optional enableSharedLibraries "lib";

buildInputs = [ perl groff cmake libxml2 python libffi ]
++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi ];
buildInputs = [ perl groff cmake libxml2 python libffi ];

propagatedBuildInputs = [ ncurses zlib ];

Expand All @@ -44,6 +43,10 @@ in stdenv.mkDerivation rec {
postPatch = stdenv.lib.optionalString (enableSharedLibraries) ''
substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib
patch -p1 < ./llvm-outputs.patch
'' + stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace cmake/modules/AddLLVM.cmake \
--replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \
--replace 'set(_install_rpath "@loader_path/../lib" ''${extra_libdir})' ""
'';

# hacky fix: created binaries need to be run before installation
Expand Down Expand Up @@ -90,25 +93,15 @@ in stdenv.mkDerivation rec {
moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib"
substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
--replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-"
'' + stdenv.lib.optionalString (stdenv.isDarwin && enableSharedLibraries) ''
substituteInPlace "$out/lib/cmake/llvm/LLVMExports-release.cmake" \
--replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib"
install_name_tool -id $lib/lib/libLLVM.dylib $lib/lib/libLLVM.dylib
install_name_tool -change @rpath/libLLVM.dylib $lib/lib/libLLVM.dylib $out/bin/llvm-config
ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib
ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib
'';


# postInstall = ""
# + stdenv.lib.optionalString (enableSharedLibraries) ''
# moveToOutput "lib/libLLVM-*" "$lib"
# moveToOutput "lib/libLLVM.${shlib}" "$lib"
# substituteInPlace "$out/lib/cmake/llvm/LLVMExports-release.cmake" \
# --replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-"
# ''
# + stdenv.lib.optionalString (stdenv.isDarwin && enableSharedLibraries) ''
# substituteInPlace "$out/lib/cmake/llvm/LLVMExports-release.cmake" \
# --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib"
# install_name_tool -id $lib/lib/libLLVM.dylib $lib/lib/libLLVM.dylib
# install_name_tool -change @rpath/libLLVM.dylib $lib/lib/libLLVM.dylib $out/bin/llvm-config
# ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib
# ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib
# '';

doCheck = false; # stdenv.isLinux;

dontStrip = debugVersion;
Expand Down