public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #113819 from anmonteiro/anmonteiro/fix-tzdata-cross

This commit is contained in:
Jörg Thalheim 2021-02-21 09:25:50 +00:00 committed by GitHub
parent 4f327f8bfa acde9a01a3
commit 17cbd6f8ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/data/misc/tzdata/default.nix
View File

@ -45,7 +45,8 @@ stdenv.mkDerivation rec {
preInstall = '' preInstall = ''
mv zic.o zic.o.orig mv zic.o zic.o.orig
mv zic zic.orig mv zic zic.orig
make $makeFlags cc=${stdenv.cc.targetPrefix}cc AR=${stdenv.cc.targetPrefix}ar zic # NOTE: in cross-compilation scenarios, this is built for the build platform.
make $makeFlags cc=cc AR=ar zic
mv zic zic-native mv zic zic-native
mv zic.o.orig zic.o mv zic.o.orig zic.o
mv zic.orig zic mv zic.orig zic