diff options
| author | lethalman <lucabru@src.gnome.org> | 2015-07-22 12:01:07 +0200 |
|---|---|---|
| committer | lethalman <lucabru@src.gnome.org> | 2015-07-22 12:01:07 +0200 |
| commit | cce3aa1e222385e846d53d8ad603637408c32037 (patch) | |
| tree | edc1a13032bbee7a169da0832a9781ff301f7e7e | |
| parent | 58430f3259d59c902d916a3fbf85fb17ed28725e (diff) | |
| parent | d2fe3405d36d41e80da7c0cfcb4f6bee2db2c9d3 (diff) | |
| download | nixlib-cce3aa1e222385e846d53d8ad603637408c32037.tar nixlib-cce3aa1e222385e846d53d8ad603637408c32037.tar.gz nixlib-cce3aa1e222385e846d53d8ad603637408c32037.tar.bz2 nixlib-cce3aa1e222385e846d53d8ad603637408c32037.tar.lz nixlib-cce3aa1e222385e846d53d8ad603637408c32037.tar.xz nixlib-cce3aa1e222385e846d53d8ad603637408c32037.tar.zst nixlib-cce3aa1e222385e846d53d8ad603637408c32037.zip | |
Merge pull request #8896 from dezgeg/pr-ovmf
edk2, OVMF: Fix build on GCC 4.9
| -rw-r--r-- | pkgs/development/compilers/edk2/default.nix | 2 |
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 = ""|' \ |