diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2021-04-15 16:25:17 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-15 16:25:17 +0200 |
commit | 978fa19ae2541c98e7ca34b5e882149a1cc9d275 (patch) | |
tree | 390a8c077321f3a8e31faa61796884ac666f6210 /pkgs/development/compilers/llvm | |
parent | f21304cfa5913a9e117c4a531fd05f55e19564b3 (diff) | |
parent | 781e69d19c45c9acb1c3dc4b5bd2f981b78895cf (diff) |
Merge pull request #119528 from sternenseemann/llvmPackages_12-reorganize-files
llvmPackages_12: reorganize files
Diffstat (limited to 'pkgs/development/compilers/llvm')
-rw-r--r-- | pkgs/development/compilers/llvm/12/compiler-rt/compiler-rt-X86-support-extension.patch (renamed from pkgs/development/compilers/llvm/12/compiler-rt-X86-support-extension.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/12/compiler-rt/compiler-rt-armv7l.patch (renamed from pkgs/development/compilers/llvm/12/compiler-rt-armv7l.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/12/compiler-rt/compiler-rt-codesign.patch (renamed from pkgs/development/compilers/llvm/12/compiler-rt-codesign.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/12/compiler-rt/default.nix (renamed from pkgs/development/compilers/llvm/12/compiler-rt.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/12/compiler-rt/sanitizers-nongnu.patch (renamed from pkgs/development/compilers/llvm/12/sanitizers-nongnu.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/12/default.nix | 12 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/12/libc++abi/default.nix (renamed from pkgs/development/compilers/llvm/12/libc++abi.nix) | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/12/libc++abi/libcxxabi-wasm.patch (renamed from pkgs/development/compilers/llvm/12/libcxxabi-wasm.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/12/libunwind/default.nix (renamed from pkgs/development/compilers/llvm/12/libunwind.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/12/lld/default.nix (renamed from pkgs/development/compilers/llvm/12/lld.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/12/lldb/default.nix (renamed from pkgs/development/compilers/llvm/12/lldb.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/12/lldb/lldb-procfs.patch (renamed from pkgs/development/compilers/llvm/12/lldb-procfs.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/12/llvm/default.nix (renamed from pkgs/development/compilers/llvm/12/llvm.nix) | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/12/llvm/llvm-outputs.patch (renamed from pkgs/development/compilers/llvm/12/llvm-outputs.patch) | 0 |
14 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/compilers/llvm/12/compiler-rt-X86-support-extension.patch b/pkgs/development/compilers/llvm/12/compiler-rt/compiler-rt-X86-support-extension.patch index f6f9336ad5ad3..f6f9336ad5ad3 100644 --- a/pkgs/development/compilers/llvm/12/compiler-rt-X86-support-extension.patch +++ b/pkgs/development/compilers/llvm/12/compiler-rt/compiler-rt-X86-support-extension.patch diff --git a/pkgs/development/compilers/llvm/12/compiler-rt-armv7l.patch b/pkgs/development/compilers/llvm/12/compiler-rt/compiler-rt-armv7l.patch index 120cfe6feb2a6..120cfe6feb2a6 100644 --- a/pkgs/development/compilers/llvm/12/compiler-rt-armv7l.patch +++ b/pkgs/development/compilers/llvm/12/compiler-rt/compiler-rt-armv7l.patch diff --git a/pkgs/development/compilers/llvm/12/compiler-rt-codesign.patch b/pkgs/development/compilers/llvm/12/compiler-rt/compiler-rt-codesign.patch index 3cc12b94b2005..3cc12b94b2005 100644 --- a/pkgs/development/compilers/llvm/12/compiler-rt-codesign.patch +++ b/pkgs/development/compilers/llvm/12/compiler-rt/compiler-rt-codesign.patch diff --git a/pkgs/development/compilers/llvm/12/compiler-rt.nix b/pkgs/development/compilers/llvm/12/compiler-rt/default.nix index e6ac77b7d265f..e6ac77b7d265f 100644 --- a/pkgs/development/compilers/llvm/12/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/12/compiler-rt/default.nix diff --git a/pkgs/development/compilers/llvm/12/sanitizers-nongnu.patch b/pkgs/development/compilers/llvm/12/compiler-rt/sanitizers-nongnu.patch index 1f2ac97818eba..1f2ac97818eba 100644 --- a/pkgs/development/compilers/llvm/12/sanitizers-nongnu.patch +++ b/pkgs/development/compilers/llvm/12/compiler-rt/sanitizers-nongnu.patch diff --git a/pkgs/development/compilers/llvm/12/default.nix b/pkgs/development/compilers/llvm/12/default.nix index 593db716ac6bc..ad7121c36a8a2 100644 --- a/pkgs/development/compilers/llvm/12/default.nix +++ b/pkgs/development/compilers/llvm/12/default.nix @@ -32,7 +32,7 @@ let ''; in { - llvm = callPackage ./llvm.nix { }; + llvm = callPackage ./llvm { }; clang-unwrapped = callPackage ./clang { inherit (tools) lld; @@ -80,11 +80,11 @@ let extraBuildCommands = mkExtraBuildCommands cc; }; - lld = callPackage ./lld.nix { + lld = callPackage ./lld { libunwind = libraries.libunwind; }; - lldb = callPackage ./lldb.nix { + lldb = callPackage ./lldb { inherit (darwin) libobjc bootstrap_cmds; inherit (darwin.apple_sdk.libs) xpc; inherit (darwin.apple_sdk.frameworks) Foundation Carbon Cocoa; @@ -172,7 +172,7 @@ let callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); in { - compiler-rt = callPackage ./compiler-rt.nix ({} // + compiler-rt = callPackage ./compiler-rt ({} // (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { stdenv = overrideCC stdenv buildLlvmTools.lldClangNoCompilerRt; })); @@ -186,7 +186,7 @@ let stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; })); - libcxxabi = callPackage ./libc++abi.nix ({} // + libcxxabi = callPackage ./libc++abi ({} // (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; libunwind = libraries.libunwind; @@ -194,7 +194,7 @@ let openmp = callPackage ./openmp.nix {}; - libunwind = callPackage ./libunwind.nix ({} // + libunwind = callPackage ./libunwind ({} // (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; })); diff --git a/pkgs/development/compilers/llvm/12/libc++abi.nix b/pkgs/development/compilers/llvm/12/libc++abi/default.nix index e35480c7bf24b..c5e9aa954b3bb 100644 --- a/pkgs/development/compilers/llvm/12/libc++abi.nix +++ b/pkgs/development/compilers/llvm/12/libc++abi/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { '' + lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin '' + lib.optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -d libcxx -i ${../libcxx-0001-musl-hacks.patch} + patch -p1 -d libcxx -i ${../../libcxx-0001-musl-hacks.patch} '' + lib.optionalString stdenv.hostPlatform.isWasm '' patch -p1 -d llvm -i ${./libcxxabi-wasm.patch} ''; diff --git a/pkgs/development/compilers/llvm/12/libcxxabi-wasm.patch b/pkgs/development/compilers/llvm/12/libc++abi/libcxxabi-wasm.patch index 4ebfe46aa813d..4ebfe46aa813d 100644 --- a/pkgs/development/compilers/llvm/12/libcxxabi-wasm.patch +++ b/pkgs/development/compilers/llvm/12/libc++abi/libcxxabi-wasm.patch diff --git a/pkgs/development/compilers/llvm/12/libunwind.nix b/pkgs/development/compilers/llvm/12/libunwind/default.nix index 83e76c0c56cd2..83e76c0c56cd2 100644 --- a/pkgs/development/compilers/llvm/12/libunwind.nix +++ b/pkgs/development/compilers/llvm/12/libunwind/default.nix diff --git a/pkgs/development/compilers/llvm/12/lld.nix b/pkgs/development/compilers/llvm/12/lld/default.nix index a5e4ab834ecf5..a5e4ab834ecf5 100644 --- a/pkgs/development/compilers/llvm/12/lld.nix +++ b/pkgs/development/compilers/llvm/12/lld/default.nix diff --git a/pkgs/development/compilers/llvm/12/lldb.nix b/pkgs/development/compilers/llvm/12/lldb/default.nix index 67de0c1874152..67de0c1874152 100644 --- a/pkgs/development/compilers/llvm/12/lldb.nix +++ b/pkgs/development/compilers/llvm/12/lldb/default.nix diff --git a/pkgs/development/compilers/llvm/12/lldb-procfs.patch b/pkgs/development/compilers/llvm/12/lldb/lldb-procfs.patch index b075dbaeee0ad..b075dbaeee0ad 100644 --- a/pkgs/development/compilers/llvm/12/lldb-procfs.patch +++ b/pkgs/development/compilers/llvm/12/lldb/lldb-procfs.patch diff --git a/pkgs/development/compilers/llvm/12/llvm.nix b/pkgs/development/compilers/llvm/12/llvm/default.nix index 6e6127ba94944..6075f9d8d55b8 100644 --- a/pkgs/development/compilers/llvm/12/llvm.nix +++ b/pkgs/development/compilers/llvm/12/llvm/default.nix @@ -73,7 +73,7 @@ in stdenv.mkDerivation (rec { --replace "PassBuilderCallbacksTest.cpp" "" rm unittests/IR/PassBuilderCallbacksTest.cpp '' + optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -i ${../TLI-musl.patch} + patch -p1 -i ${../../TLI-musl.patch} substituteInPlace unittests/Support/CMakeLists.txt \ --replace "add_subdirectory(DynamicLibrary)" "" rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp diff --git a/pkgs/development/compilers/llvm/12/llvm-outputs.patch b/pkgs/development/compilers/llvm/12/llvm/llvm-outputs.patch index 40096fa3497fd..40096fa3497fd 100644 --- a/pkgs/development/compilers/llvm/12/llvm-outputs.patch +++ b/pkgs/development/compilers/llvm/12/llvm/llvm-outputs.patch |