musl: build iconv using just-built pieces
This is a bit unusual for a package, but not libc's as they should stand alone.
This commit is contained in:
parent
97698b0d6d
commit
2d54f8f915
|
@ -68,6 +68,8 @@ stdenv.mkDerivation rec {
|
||||||
dontDisableStatic = true;
|
dontDisableStatic = true;
|
||||||
separateDebugInfo = true;
|
separateDebugInfo = true;
|
||||||
|
|
||||||
|
NIX_DONT_SET_RPATH = true;
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
# Not sure why, but link in all but scsi directory as that's what uclibc/glibc do.
|
# Not sure why, but link in all but scsi directory as that's what uclibc/glibc do.
|
||||||
# Apparently glibc provides scsi itself?
|
# Apparently glibc provides scsi itself?
|
||||||
|
@ -88,8 +90,13 @@ stdenv.mkDerivation rec {
|
||||||
substituteInPlace $dev/bin/musl-gcc \
|
substituteInPlace $dev/bin/musl-gcc \
|
||||||
--replace $out/lib/musl-gcc.specs $dev/lib/musl-gcc.specs
|
--replace $out/lib/musl-gcc.specs $dev/lib/musl-gcc.specs
|
||||||
|
|
||||||
# provide 'iconv' utility
|
# provide 'iconv' utility, using just-built headers, libc/ldso
|
||||||
$CC ${iconv_c} -o $out/bin/iconv
|
$CC ${iconv_c} -o $out/bin/iconv \
|
||||||
|
-I$dev/include \
|
||||||
|
-L$out/lib -Wl,-rpath=$out/lib \
|
||||||
|
-lc \
|
||||||
|
-B $out/lib \
|
||||||
|
-Wl,-dynamic-linker=$(ls $out/lib/ld-*)
|
||||||
'' + lib.optionalString useBSDCompatHeaders ''
|
'' + lib.optionalString useBSDCompatHeaders ''
|
||||||
install -D ${queue_h} $dev/include/sys/queue.h
|
install -D ${queue_h} $dev/include/sys/queue.h
|
||||||
install -D ${cdefs_h} $dev/include/sys/cdefs.h
|
install -D ${cdefs_h} $dev/include/sys/cdefs.h
|
||||||
|
|
Loading…
Reference in a new issue