diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-05 16:55:11 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-05 16:55:11 -0500 |
| commit | c9ca54199409324101bdee38f5b16e7656a16a22 (patch) | |
| tree | d34ef57bacca397a4ec49203a18029e64d1c800d /pkgs/development/compilers/gcc/4.8 | |
| parent | c8d435476d85ddcab66d3f487332a2073f2d27e5 (diff) | |
| parent | 198dceccbe5414a5fd72ca83624c0cc715db1aad (diff) | |
| download | nixlib-c9ca54199409324101bdee38f5b16e7656a16a22.tar nixlib-c9ca54199409324101bdee38f5b16e7656a16a22.tar.gz nixlib-c9ca54199409324101bdee38f5b16e7656a16a22.tar.bz2 nixlib-c9ca54199409324101bdee38f5b16e7656a16a22.tar.lz nixlib-c9ca54199409324101bdee38f5b16e7656a16a22.tar.xz nixlib-c9ca54199409324101bdee38f5b16e7656a16a22.tar.zst nixlib-c9ca54199409324101bdee38f5b16e7656a16a22.zip | |
Merge commit '198dceccbe5414a5fd72ca83624c0cc715db1aad' into gcc-simplify-flags
Diffstat (limited to 'pkgs/development/compilers/gcc/4.8')
| -rw-r--r-- | pkgs/development/compilers/gcc/4.8/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 69348d50d0ac..906fb69adc72 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -403,7 +403,7 @@ stdenv.mkDerivation ({ CC_FOR_TARGET = "${targetPlatform.config}-gcc"; CXX_FOR_TARGET = "${targetPlatform.config}-g++"; # If we are making a cross compiler, cross != null - NIX_CC_CROSS = if targetPlatform == hostPlatform then "${stdenv.ccCross}" else ""; + NIX_CC_CROSS = optionalString (targetPlatform == hostPlatform) builtins.toString stdenv.cc; dontStrip = true; buildFlags = ""; }; |