diff options
author | Jörg Thalheim <joerg@thalheim.io> | 2018-12-12 09:21:47 +0000 |
---|---|---|
committer | Jörg Thalheim <joerg@thalheim.io> | 2018-12-14 09:40:52 +0000 |
commit | e84bd8db9f6ebacd46e21009e40c0a402930dc5b (patch) | |
tree | 1d16dbe217faece18394b953e72a19e184115398 /pkgs/development/compilers/llvm | |
parent | fd463810ae7a453b4cccea44d3076e2cfadd00c7 (diff) | |
download | nixlib-e84bd8db9f6ebacd46e21009e40c0a402930dc5b.tar nixlib-e84bd8db9f6ebacd46e21009e40c0a402930dc5b.tar.gz nixlib-e84bd8db9f6ebacd46e21009e40c0a402930dc5b.tar.bz2 nixlib-e84bd8db9f6ebacd46e21009e40c0a402930dc5b.tar.lz nixlib-e84bd8db9f6ebacd46e21009e40c0a402930dc5b.tar.xz nixlib-e84bd8db9f6ebacd46e21009e40c0a402930dc5b.tar.zst nixlib-e84bd8db9f6ebacd46e21009e40c0a402930dc5b.zip |
llvm_7: fix cross-compilation
Diffstat (limited to 'pkgs/development/compilers/llvm')
-rw-r--r-- | pkgs/development/compilers/llvm/7/llvm.nix | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix index 6fcdc394bed4..69d76effca74 100644 --- a/pkgs/development/compilers/llvm/7/llvm.nix +++ b/pkgs/development/compilers/llvm/7/llvm.nix @@ -10,15 +10,17 @@ , version , release_version , zlib +, buildPackages , debugVersion ? false , enableManpages ? false , enableSharedLibraries ? true -, targets ? [ stdenv.hostPlatform stdenv.targetPlatform ] -, enableWasm ? true # TODO fold this into `targets` somehow +, enableTargets ? [ stdenv.hostPlatform stdenv.targetPlatform ] , enablePFM ? !stdenv.isDarwin }: let + inherit (stdenv.lib) optional optionals optionalString; + src = fetch "llvm" "08p27wv1pr9ql2zc3f3qkkymci46q7myvh8r5ijippnbwr2gihcb"; # Used when creating a version-suffixed symlink of libLLVM.dylib @@ -38,23 +40,23 @@ in stdenv.mkDerivation (rec { ''; outputs = [ "out" "python" ] - ++ stdenv.lib.optional enableSharedLibraries "lib"; + ++ optional enableSharedLibraries "lib"; nativeBuildInputs = [ cmake python ] - ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; + ++ optional enableManpages python.pkgs.sphinx; buildInputs = [ libxml2 libffi ] - ++ stdenv.lib.optional enablePFM libpfm; # exegesis + ++ optional enablePFM libpfm; # exegesis propagatedBuildInputs = [ ncurses zlib ]; - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = optionalString stdenv.isDarwin '' substituteInPlace cmake/modules/AddLLVM.cmake \ --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir INSTALL_NAME_DIR "$lib/lib")" \ --replace 'set(_install_rpath "@loader_path/../lib" ''${extra_libdir})' "" '' # Patch llvm-config to return correct library path based on --link-{shared,static}. - + stdenv.lib.optionalString (enableSharedLibraries) '' + + optionalString (enableSharedLibraries) '' substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib patch -p1 < ./llvm-outputs.patch '' + '' @@ -62,7 +64,7 @@ in stdenv.mkDerivation (rec { substituteInPlace unittests/Support/CMakeLists.txt \ --replace "Path.cpp" "" rm unittests/Support/Path.cpp - '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + '' + optionalString stdenv.hostPlatform.isMusl '' patch -p1 -i ${../TLI-musl.patch} substituteInPlace unittests/Support/CMakeLists.txt \ --replace "add_subdirectory(DynamicLibrary)" "" @@ -85,28 +87,26 @@ in stdenv.mkDerivation (rec { "-DLLVM_ENABLE_RTTI=ON" "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" - "-DLLVM_TARGETS_TO_BUILD=${llvmBackendList targets}" - + "-DLLVM_TARGETS_TO_BUILD=${llvmBackendList enableTargets}" + "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly" "-DLLVM_ENABLE_DUMP=ON" - ] - ++ stdenv.lib.optional enableSharedLibraries + ] ++ optionals enableSharedLibraries [ "-DLLVM_LINK_LLVM_DYLIB=ON" - ++ stdenv.lib.optionals enableManpages [ + ] ++ optionals enableManpages [ "-DLLVM_BUILD_DOCS=ON" "-DLLVM_ENABLE_SPHINX=ON" "-DSPHINX_OUTPUT_MAN=ON" "-DSPHINX_OUTPUT_HTML=OFF" "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] - ++ stdenv.lib.optional (!isDarwin) + ] ++ optionals (!isDarwin) [ "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" - ++ stdenv.lib.optionals (isDarwin) [ + ] ++ optionals (isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" - ] - ++ stdenv.lib.optional enableWasm - "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly" - ; + ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DCMAKE_CROSSCOMPILING=True" + "-DLLVM_TABLEGEN=${buildPackages.llvm_7}/bin/llvm-tblgen" + ]; postBuild = '' rm -fR $out @@ -126,13 +126,13 @@ in stdenv.mkDerivation (rec { mkdir -p $python/share mv $out/share/opt-viewer $python/share/opt-viewer '' - + stdenv.lib.optionalString enableSharedLibraries '' + + optionalString enableSharedLibraries '' moveToOutput "lib/libLLVM-*" "$lib" 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) '' + + optionalString (stdenv.isDarwin && enableSharedLibraries) '' substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib" ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib |