diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-23 12:49:28 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-23 12:55:07 +0200 |
| commit | 4747796a9ec0c1310111b3cf3b9a624bba48359c (patch) | |
| tree | 647beafc5df10c135f8e87dda91cb8fdb1421512 | |
| parent | c085d63a9d45d2dbcaf8554bb79945e89f738e3c (diff) | |
| download | nixpkgs-4747796a9ec0c1310111b3cf3b9a624bba48359c.tar nixpkgs-4747796a9ec0c1310111b3cf3b9a624bba48359c.tar.gz nixpkgs-4747796a9ec0c1310111b3cf3b9a624bba48359c.tar.bz2 nixpkgs-4747796a9ec0c1310111b3cf3b9a624bba48359c.tar.lz nixpkgs-4747796a9ec0c1310111b3cf3b9a624bba48359c.tar.xz nixpkgs-4747796a9ec0c1310111b3cf3b9a624bba48359c.tar.zst nixpkgs-4747796a9ec0c1310111b3cf3b9a624bba48359c.zip | |
Build RPMs for i686 rather than i386
The default target (i386-linux) causes flags like "-march i386" to be added, which breaks on recent Fedora releases (18 and up), resulting in errors like: /usr/lib/gcc/i686-redhat-linux/4.7.2/../../../../include/c++/4.7.2/ext/atomicity.h:48: undefined reference to `__atomic_fetch_add_4' So set the target to i686-linux. http://hydra.nixos.org/build/6567357
| -rw-r--r-- | pkgs/build-support/vm/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index ce35832d78c..0296c434d6f 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -514,7 +514,8 @@ rec { echo "%_topdir $rpmout" >> $HOME/.rpmmacros - rpmbuild -vv -ta "$srcName" + if [ `uname -m` = i686 ]; then extra="--target i686-linux"; fi + rpmbuild -vv $extra -ta "$srcName" eval "$postBuild" ''; |