pyrox.dev
libc++{,abi}_38: musl fixes, cmake is nativeBuildInput
+10
-3
pkgs/development/compilers/llvm/3.8/libc++/default.nix
+10
-3
pkgs/development/compilers/llvm/3.8/libc++/default.nix
···
17
17
patches = [
18
18
# glibc 2.26 fix
19
19
../../3.9/libc++/xlocale-glibc-2.26.patch
20
-
] ++ lib.optional stdenv.isDarwin ./darwin.patch;
20
+
]
21
+
++ lib.optional stdenv.isDarwin ./darwin.patch
22
+
++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
23
+
../../libcxx-0001-musl-hacks.patch
24
+
../../libcxx-max_align_t.patch
25
+
];
26
+
27
+
nativeBuildInputs = [ cmake ];
21
28
22
-
buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
29
+
buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
23
30
24
31
cmakeFlags = [
25
32
"-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
26
33
"-DLIBCXX_LIBCPPABI_VERSION=2"
27
34
"-DLIBCXX_CXX_ABI=libcxxabi"
28
-
];
35
+
] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1";
29
36
30
37
enableParallelBuilding = true;
31
38
+3
pkgs/development/compilers/llvm/3.8/libc++abi.nix
+3
pkgs/development/compilers/llvm/3.8/libc++abi.nix
···
15
15
export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_INCLUDES=$PWD/$(ls -d libcxx-*)/include"
16
16
'' + stdenv.lib.optionalString stdenv.isDarwin ''
17
17
export TRIPLE=x86_64-apple-darwin
18
+
'' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
19
+
patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch}
20
+
patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-max_align_t.patch}
18
21
'';
19
22
20
23
installPhase = if stdenv.isDarwin