libiconv: get just headers from wasilibc
This commit is contained in:
parent
9044f57d18
commit
721832f97e
|
@ -10311,7 +10311,7 @@ in
|
||||||
else if stdenv.targetPlatform.useiOSPrebuilt then targetPackages.darwin.iosSdkPkgs.libraries or darwin.iosSdkPkgs.libraries
|
else if stdenv.targetPlatform.useiOSPrebuilt then targetPackages.darwin.iosSdkPkgs.libraries or darwin.iosSdkPkgs.libraries
|
||||||
else if name == "libSystem" then targetPackages.darwin.xcode
|
else if name == "libSystem" then targetPackages.darwin.xcode
|
||||||
else if name == "nblibc" then targetPackages.netbsdCross.libc
|
else if name == "nblibc" then targetPackages.netbsdCross.libc
|
||||||
else if name == "wasilibc" then targetPackages.wasilibc
|
else if name == "wasilibc" then targetPackages.wasilibc or wasilibc
|
||||||
else throw "Unknown libc ${name}";
|
else throw "Unknown libc ${name}";
|
||||||
|
|
||||||
libcCross = assert stdenv.targetPlatform != stdenv.buildPlatform; libcCrossChooser stdenv.targetPlatform.libc;
|
libcCross = assert stdenv.targetPlatform != stdenv.buildPlatform; libcCrossChooser stdenv.targetPlatform.libc;
|
||||||
|
@ -11402,7 +11402,7 @@ in
|
||||||
# We also provide `libiconvReal`, which will always be a standalone libiconv,
|
# We also provide `libiconvReal`, which will always be a standalone libiconv,
|
||||||
# just in case you want it regardless of platform.
|
# just in case you want it regardless of platform.
|
||||||
libiconv =
|
libiconv =
|
||||||
if (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.libc == "musl")
|
if lib.elem stdenv.hostPlatform.libc ["glibc" "musl" "wasilibc"]
|
||||||
then glibcIconv (if stdenv.hostPlatform != stdenv.buildPlatform
|
then glibcIconv (if stdenv.hostPlatform != stdenv.buildPlatform
|
||||||
then libcCross
|
then libcCross
|
||||||
else stdenv.cc.libc)
|
else stdenv.cc.libc)
|
||||||
|
|
Loading…
Reference in a new issue