about summary refs log tree commit diff
path: root/pkgs/development/compilers/edk2
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas.tynkkynen@iki.fi>2015-07-20 09:01:20 +0300
committerTuomas Tynkkynen <tuomas.tynkkynen@iki.fi>2015-07-20 09:05:58 +0300
commitd2fe3405d36d41e80da7c0cfcb4f6bee2db2c9d3 (patch)
treec32730976152780d7801c1dd3a3195dee08c4a6c /pkgs/development/compilers/edk2
parentd54659fe9628fc460b4b591fac84dfe4b1841231 (diff)
downloadnixlib-d2fe3405d36d41e80da7c0cfcb4f6bee2db2c9d3.tar
nixlib-d2fe3405d36d41e80da7c0cfcb4f6bee2db2c9d3.tar.gz
nixlib-d2fe3405d36d41e80da7c0cfcb4f6bee2db2c9d3.tar.bz2
nixlib-d2fe3405d36d41e80da7c0cfcb4f6bee2db2c9d3.tar.lz
nixlib-d2fe3405d36d41e80da7c0cfcb4f6bee2db2c9d3.tar.xz
nixlib-d2fe3405d36d41e80da7c0cfcb4f6bee2db2c9d3.tar.zst
nixlib-d2fe3405d36d41e80da7c0cfcb4f6bee2db2c9d3.zip
edk2, OVMF: Fix build on GCC 4.9
The toolchain must be correctly specified in the OVMF build or it fails
with 'Unsupported section alignment':

http://hydra.nixos.org/build/23859056
Diffstat (limited to 'pkgs/development/compilers/edk2')
-rw-r--r--pkgs/development/compilers/edk2/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix
index ebbac8ec3553..f68681e60232 100644
--- a/pkgs/development/compilers/edk2/default.nix
+++ b/pkgs/development/compilers/edk2/default.nix
@@ -46,7 +46,7 @@ edk2 = stdenv.mkDerivation {
       configurePhase = ''
         mkdir -v Conf
         sed -e 's|Nt32Pkg/Nt32Pkg.dsc|${projectDscPath}|' -e \
-          's|MYTOOLS|GCC48|' -e 's|IA32|${targetArch}|' -e 's|DEBUG|RELEASE|'\
+          's|MYTOOLS|GCC49|' -e 's|IA32|${targetArch}|' -e 's|DEBUG|RELEASE|'\
           < ${edk2}/BaseTools/Conf/target.template > Conf/target.txt
         sed -e 's|DEFINE GCC48_IA32_PREFIX       = /usr/bin/|DEFINE GCC48_IA32_PREFIX       = ""|' \
           -e 's|DEFINE GCC48_X64_PREFIX        = /usr/bin/|DEFINE GCC48_X64_PREFIX        = ""|' \