mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-01 01:57:37 +03:00
ghc{843,861}: keep '-musleabi' in targets like w/'-gnueabi'
This commit is contained in:
parent
894f313e3c
commit
773ae700b7
@ -125,13 +125,21 @@ stdenv.mkDerivation (rec {
|
|||||||
'' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
|
'' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
|
||||||
sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
|
sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
|
||||||
'' + stdenv.lib.optionalString targetPlatform.isMusl ''
|
'' + stdenv.lib.optionalString targetPlatform.isMusl ''
|
||||||
echo "patching llvm-targets for musl targets...."
|
echo "patching llvm-targets for musl targets..."
|
||||||
echo "Cloning these existing '*-linux-gnu*' targets:"
|
echo "Cloning these existing '*-linux-gnu*' targets:"
|
||||||
grep linux-gnu llvm-targets | sed 's/^/ /'
|
grep linux-gnu llvm-targets | sed 's/^/ /'
|
||||||
echo "go go gadget sed"
|
echo "(go go gadget sed)"
|
||||||
sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets
|
sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets
|
||||||
echo "llvm-targets now contains these '*-linux-musl*' targets:"
|
echo "llvm-targets now contains these '*-linux-musl*' targets:"
|
||||||
grep linux-musl llvm-targets | sed 's/^/ /'
|
grep linux-musl llvm-targets | sed 's/^/ /'
|
||||||
|
|
||||||
|
echo "And now patching to preserve '-musleabi' as done with '-gnueabi'"
|
||||||
|
# (aclocal.m4 is actual source, but patch configure as well since we don't re-gen)
|
||||||
|
for x in configure aclocal.m4; do
|
||||||
|
substituteInPlace $x \
|
||||||
|
--replace '*-android*|*-gnueabi*)' \
|
||||||
|
'*-android*|*-gnueabi*|*-musleabi*)'
|
||||||
|
done
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# TODO(@Ericson2314): Always pass "--target" and always prefix.
|
# TODO(@Ericson2314): Always pass "--target" and always prefix.
|
||||||
|
@ -117,13 +117,21 @@ stdenv.mkDerivation (rec {
|
|||||||
'' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
|
'' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
|
||||||
sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
|
sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
|
||||||
'' + stdenv.lib.optionalString targetPlatform.isMusl ''
|
'' + stdenv.lib.optionalString targetPlatform.isMusl ''
|
||||||
echo "patching llvm-targets for musl targets...."
|
echo "patching llvm-targets for musl targets..."
|
||||||
echo "Cloning these existing '*-linux-gnu*' targets:"
|
echo "Cloning these existing '*-linux-gnu*' targets:"
|
||||||
grep linux-gnu llvm-targets | sed 's/^/ /'
|
grep linux-gnu llvm-targets | sed 's/^/ /'
|
||||||
echo "go go gadget sed"
|
echo "(go go gadget sed)"
|
||||||
sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets
|
sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets
|
||||||
echo "llvm-targets now contains these '*-linux-musl*' targets:"
|
echo "llvm-targets now contains these '*-linux-musl*' targets:"
|
||||||
grep linux-musl llvm-targets | sed 's/^/ /'
|
grep linux-musl llvm-targets | sed 's/^/ /'
|
||||||
|
|
||||||
|
echo "And now patching to preserve '-musleabi' as done with '-gnueabi'"
|
||||||
|
# (aclocal.m4 is actual source, but patch configure as well since we don't re-gen)
|
||||||
|
for x in configure aclocal.m4; do
|
||||||
|
substituteInPlace $x \
|
||||||
|
--replace '*-android*|*-gnueabi*)' \
|
||||||
|
'*-android*|*-gnueabi*|*-musleabi*)'
|
||||||
|
done
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# TODO(@Ericson2314): Always pass "--target" and always prefix.
|
# TODO(@Ericson2314): Always pass "--target" and always prefix.
|
||||||
|
Loading…
Reference in New Issue
Block a user