diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-06-23 12:16:40 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-06-23 12:16:40 +0200 |
| commit | d3e599c9e1a9a2dde26054be5a484a786527cbc9 (patch) | |
| tree | ce217fd8a5645f9b7bf27a5831b50865b36acb16 /pkgs/development/compilers/gcc/5 | |
| parent | 73bfbfae528f9464f0e683233288f5e5c5f558cc (diff) | |
| parent | d5dbeec3b09ff9a0917e08423e860d784a7e9efc (diff) | |
| download | nixlib-d3e599c9e1a9a2dde26054be5a484a786527cbc9.tar nixlib-d3e599c9e1a9a2dde26054be5a484a786527cbc9.tar.gz nixlib-d3e599c9e1a9a2dde26054be5a484a786527cbc9.tar.bz2 nixlib-d3e599c9e1a9a2dde26054be5a484a786527cbc9.tar.lz nixlib-d3e599c9e1a9a2dde26054be5a484a786527cbc9.tar.xz nixlib-d3e599c9e1a9a2dde26054be5a484a786527cbc9.tar.zst nixlib-d3e599c9e1a9a2dde26054be5a484a786527cbc9.zip | |
Merge #16355: gcc: darwin support
Diffstat (limited to 'pkgs/development/compilers/gcc/5')
| -rw-r--r-- | pkgs/development/compilers/gcc/5/default.nix | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index 9ab725e2da88..4802c3fe2782 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -199,7 +199,7 @@ let version = "5.4.0"; stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else ""; - bootstrap = cross == null; + bootstrap = cross == null && !stdenv.isDarwin; in @@ -307,15 +307,6 @@ stdenv.mkDerivation ({ export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET" export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET" export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET" - '' + stdenv.lib.optionalString stdenv.isDarwin '' - if SDKROOT=$(/usr/bin/xcrun --show-sdk-path); then - configureFlagsArray+=(--with-native-system-header-dir=$SDKROOT/usr/include) - makeFlagsArray+=( \ - CFLAGS_FOR_BUILD=-F$SDKROOT/System/Library/Frameworks \ - CFLAGS_FOR_TARGET=-F$SDKROOT/System/Library/Frameworks \ - FLAGS_FOR_TARGET=-F$SDKROOT/System/Library/Frameworks \ - ) - fi ''; dontDisableStatic = true; |