public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cctools: Cleanup useOld conditions slightly

Browse Source 
60771af5b6fc183aa354ed95e4df32c497382414 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" # include_next "unistd.h"
#endif #endif
EOF 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 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 # 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? # hairy to handle during bootstrap. Perhaps it could be optional?
preConfigure = stdenv.lib.optionalString (!useOld) '' preConfigure = ''
cd cctools
'' + ''
sh autogen.sh sh autogen.sh
''; '';