pkgsCross.musl64.go: fix build
This commit is contained in:
parent
3e8e3e1f07
commit
b730214152
3 changed files with 6 additions and 6 deletions
|
@ -149,13 +149,13 @@ stdenv.mkDerivation rec {
|
||||||
# Contains the wrong perl shebang when cross compiling,
|
# Contains the wrong perl shebang when cross compiling,
|
||||||
# since it is not used for anything we can deleted as well.
|
# since it is not used for anything we can deleted as well.
|
||||||
rm src/regexp/syntax/make_perl_groups.pl
|
rm src/regexp/syntax/make_perl_groups.pl
|
||||||
'' + (if (stdenv.buildPlatform != stdenv.hostPlatform) then ''
|
'' + (if (stdenv.buildPlatform.system != stdenv.hostPlatform.system) then ''
|
||||||
mv bin/*_*/* bin
|
mv bin/*_*/* bin
|
||||||
rmdir bin/*_*
|
rmdir bin/*_*
|
||||||
${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) ''
|
${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) ''
|
||||||
rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH}
|
rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH}
|
||||||
''}
|
''}
|
||||||
'' else lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) ''
|
'' else lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) ''
|
||||||
rm -rf bin/*_*
|
rm -rf bin/*_*
|
||||||
${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) ''
|
${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) ''
|
||||||
rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH}
|
rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH}
|
||||||
|
|
|
@ -149,13 +149,13 @@ stdenv.mkDerivation rec {
|
||||||
# Contains the wrong perl shebang when cross compiling,
|
# Contains the wrong perl shebang when cross compiling,
|
||||||
# since it is not used for anything we can deleted as well.
|
# since it is not used for anything we can deleted as well.
|
||||||
rm src/regexp/syntax/make_perl_groups.pl
|
rm src/regexp/syntax/make_perl_groups.pl
|
||||||
'' + (if (stdenv.buildPlatform != stdenv.hostPlatform) then ''
|
'' + (if (stdenv.buildPlatform.system != stdenv.hostPlatform.system) then ''
|
||||||
mv bin/*_*/* bin
|
mv bin/*_*/* bin
|
||||||
rmdir bin/*_*
|
rmdir bin/*_*
|
||||||
${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) ''
|
${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) ''
|
||||||
rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH}
|
rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH}
|
||||||
''}
|
''}
|
||||||
'' else lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) ''
|
'' else lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) ''
|
||||||
rm -rf bin/*_*
|
rm -rf bin/*_*
|
||||||
${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) ''
|
${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) ''
|
||||||
rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH}
|
rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH}
|
||||||
|
|
|
@ -141,13 +141,13 @@ stdenv.mkDerivation rec {
|
||||||
# Contains the wrong perl shebang when cross compiling,
|
# Contains the wrong perl shebang when cross compiling,
|
||||||
# since it is not used for anything we can deleted as well.
|
# since it is not used for anything we can deleted as well.
|
||||||
rm src/regexp/syntax/make_perl_groups.pl
|
rm src/regexp/syntax/make_perl_groups.pl
|
||||||
'' + (if (stdenv.buildPlatform != stdenv.hostPlatform) then ''
|
'' + (if (stdenv.buildPlatform.system != stdenv.hostPlatform.system) then ''
|
||||||
mv bin/*_*/* bin
|
mv bin/*_*/* bin
|
||||||
rmdir bin/*_*
|
rmdir bin/*_*
|
||||||
${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) ''
|
${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) ''
|
||||||
rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH}
|
rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH}
|
||||||
''}
|
''}
|
||||||
'' else lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) ''
|
'' else lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) ''
|
||||||
rm -rf bin/*_*
|
rm -rf bin/*_*
|
||||||
${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) ''
|
${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) ''
|
||||||
rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH}
|
rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH}
|
||||||
|
|
Loading…
Reference in a new issue