MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 16:45:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

cctools: Cleanup useOld conditions slightly

Browse source 
60771af5b6 jumped through some hoops in
order to avoid a mass-rebuild.
This commit is contained in:
John Ericson 2018-04-30 23:35:21 -04:00
parent 60771af5b6
commit 4b3cc9ed87
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/os-specific/darwin/cctools/port.nix
View file

@ -108,17 +108,15 @@ let
# include_next "unistd.h"
#endif
EOF
'' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
sed -i -e 's|clang++|& -I${libcxx}/include/c++/v1|' cctools/autogen.sh
'' + stdenv.lib.optionalString useOld ''
cd cctools
'' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
sed -i -e 's|clang++|& -I${libcxx}/include/c++/v1|' autogen.sh
'';
# TODO: this builds an ld without support for LLVM's LTO. We need to teach it, but that's rather
# hairy to handle during bootstrap. Perhaps it could be optional?
preConfigure = stdenv.lib.optionalString (!useOld) ''
cd cctools
'' + ''
preConfigure = ''
sh autogen.sh
'';