git.iko.soy/typeable/nixpkgs
on master help sign in
llvmPackages_12: reorganize files

Restructure pkgs/development/compilers/llvm/12 in a similar spirit as #117433 to mirror the other llvm directories.

commit781e69d19c45c9acb1c3dc4b5bd2f981b78895cf authorsternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> dateThu 15 Apr 2021, 12:44 (6 years ago) parent6802c2e
14 files changed+8−8
pkgs/development/compilers/llvm/12/compiler-rt-X86-support-extension.patch → pkgs/development/compilers/llvm/12/compiler-rt/compiler-rt-X86-support-extension.patch pkgs/development/compilers/llvm/12/compiler-rt-armv7l.patch → pkgs/development/compilers/llvm/12/compiler-rt/compiler-rt-armv7l.patch pkgs/development/compilers/llvm/12/compiler-rt-codesign.patch → pkgs/development/compilers/llvm/12/compiler-rt/compiler-rt-codesign.patch pkgs/development/compilers/llvm/12/compiler-rt.nix → pkgs/development/compilers/llvm/12/compiler-rt/default.nix pkgs/development/compilers/llvm/12/sanitizers-nongnu.patch → pkgs/development/compilers/llvm/12/compiler-rt/sanitizers-nongnu.patch pkgs/development/compilers/llvm/12/default.nix+6−6 pkgs/development/compilers/llvm/12/libc++abi.nix → pkgs/development/compilers/llvm/12/libc++abi/default.nix+1−1 pkgs/development/compilers/llvm/12/libcxxabi-wasm.patch → pkgs/development/compilers/llvm/12/libc++abi/libcxxabi-wasm.patch pkgs/development/compilers/llvm/12/libunwind.nix → pkgs/development/compilers/llvm/12/libunwind/default.nix pkgs/development/compilers/llvm/12/lld.nix → pkgs/development/compilers/llvm/12/lld/default.nix pkgs/development/compilers/llvm/12/lldb.nix → pkgs/development/compilers/llvm/12/lldb/default.nix pkgs/development/compilers/llvm/12/lldb-procfs.patch → pkgs/development/compilers/llvm/12/lldb/lldb-procfs.patch pkgs/development/compilers/llvm/12/llvm.nix → pkgs/development/compilers/llvm/12/llvm/default.nix+1−1 pkgs/development/compilers/llvm/12/llvm-outputs.patch → pkgs/development/compilers/llvm/12/llvm/llvm-outputs.patch
pkgs/development/compilers/llvm/12/compiler-rt-X86-support-extension.patch → pkgs/development/compilers/llvm/12/compiler-rt/compiler-rt-X86-support-extension.patchrenamed

The content is the same.

pkgs/development/compilers/llvm/12/compiler-rt-armv7l.patch → pkgs/development/compilers/llvm/12/compiler-rt/compiler-rt-armv7l.patchrenamed

The content is the same.

pkgs/development/compilers/llvm/12/compiler-rt-codesign.patch → pkgs/development/compilers/llvm/12/compiler-rt/compiler-rt-codesign.patchrenamed

The content is the same.

pkgs/development/compilers/llvm/12/compiler-rt.nix → pkgs/development/compilers/llvm/12/compiler-rt/default.nixrenamed

The content is the same.

pkgs/development/compilers/llvm/12/sanitizers-nongnu.patch → pkgs/development/compilers/llvm/12/compiler-rt/sanitizers-nongnu.patchrenamed

The content is the same.

pkgs/development/compilers/llvm/12/default.nix+6−6
@@ -32,7 +32,7 @@ let
3232 '';
3333 in {
3434
35− llvm = callPackage ./llvm.nix { };
35+ llvm = callPackage ./llvm { };
3636
3737 clang-unwrapped = callPackage ./clang {
3838 inherit (tools) lld;
@@ -80,11 +80,11 @@ let
8080 extraBuildCommands = mkExtraBuildCommands cc;
8181 };
8282
83− lld = callPackage ./lld.nix {
83+ lld = callPackage ./lld {
8484 libunwind = libraries.libunwind;
8585 };
8686
87− lldb = callPackage ./lldb.nix {
87+ lldb = callPackage ./lldb {
8888 inherit (darwin) libobjc bootstrap_cmds;
8989 inherit (darwin.apple_sdk.libs) xpc;
9090 inherit (darwin.apple_sdk.frameworks) Foundation Carbon Cocoa;
@@ -172,7 +172,7 @@ let
172172 callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
173173 in {
174174
175− compiler-rt = callPackage ./compiler-rt.nix ({} //
175+ compiler-rt = callPackage ./compiler-rt ({} //
176176 (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
177177 stdenv = overrideCC stdenv buildLlvmTools.lldClangNoCompilerRt;
178178 }));
@@ -186,7 +186,7 @@ let
186186 stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
187187 }));
188188
189− libcxxabi = callPackage ./libc++abi.nix ({} //
189+ libcxxabi = callPackage ./libc++abi ({} //
190190 (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
191191 stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
192192 libunwind = libraries.libunwind;
@@ -194,7 +194,7 @@ let
194194
195195 openmp = callPackage ./openmp.nix {};
196196
197− libunwind = callPackage ./libunwind.nix ({} //
197+ libunwind = callPackage ./libunwind ({} //
198198 (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
199199 stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
200200 }));
pkgs/development/compilers/llvm/12/libc++abi.nix → pkgs/development/compilers/llvm/12/libc++abi/default.nixrenamed+1−1
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
2929 '' + lib.optionalString stdenv.isDarwin ''
3030 export TRIPLE=x86_64-apple-darwin
3131 '' + lib.optionalString stdenv.hostPlatform.isMusl ''
32− patch -p1 -d libcxx -i ${../libcxx-0001-musl-hacks.patch}
32+ patch -p1 -d libcxx -i ${../../libcxx-0001-musl-hacks.patch}
3333 '' + lib.optionalString stdenv.hostPlatform.isWasm ''
3434 patch -p1 -d llvm -i ${./libcxxabi-wasm.patch}
3535 '';
pkgs/development/compilers/llvm/12/libcxxabi-wasm.patch → pkgs/development/compilers/llvm/12/libc++abi/libcxxabi-wasm.patchrenamed

The content is the same.

pkgs/development/compilers/llvm/12/libunwind.nix → pkgs/development/compilers/llvm/12/libunwind/default.nixrenamed

The content is the same.

pkgs/development/compilers/llvm/12/lld.nix → pkgs/development/compilers/llvm/12/lld/default.nixrenamed

The content is the same.

pkgs/development/compilers/llvm/12/lldb.nix → pkgs/development/compilers/llvm/12/lldb/default.nixrenamed

The content is the same.

pkgs/development/compilers/llvm/12/lldb-procfs.patch → pkgs/development/compilers/llvm/12/lldb/lldb-procfs.patchrenamed

The content is the same.

pkgs/development/compilers/llvm/12/llvm.nix → pkgs/development/compilers/llvm/12/llvm/default.nixrenamed+1−1
@@ -73,7 +73,7 @@ in stdenv.mkDerivation (rec {
7373 --replace "PassBuilderCallbacksTest.cpp" ""
7474 rm unittests/IR/PassBuilderCallbacksTest.cpp
7575 '' + optionalString stdenv.hostPlatform.isMusl ''
76− patch -p1 -i ${../TLI-musl.patch}
76+ patch -p1 -i ${../../TLI-musl.patch}
7777 substituteInPlace unittests/Support/CMakeLists.txt \
7878 --replace "add_subdirectory(DynamicLibrary)" ""
7979 rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp
pkgs/development/compilers/llvm/12/llvm-outputs.patch → pkgs/development/compilers/llvm/12/llvm/llvm-outputs.patchrenamed

The content is the same.