From 08f3a60e7bfeed422f7ab5f7ccfeeb0ad8175f92 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 23 Aug 2017 17:09:47 -0400 Subject: [PATCH] cc-wrapper: Remove dead code ccPath is only defined below, so this condition would never be true. Worse, that's not quite true: what if somebody happend to have `/clang` and no sandboxing. Boy, wouldn't that be annoying to debug! --- pkgs/build-support/cc-wrapper/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index b3971808a2b..bc29de7918b 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -217,13 +217,6 @@ stdenv.mkDerivation { echo "$gnatCFlags" > $out/nix-support/gnat-cflags ''} - if [ -e $ccPath/clang ]; then - # Need files like crtbegin.o from gcc - # It's unclear if these will ever be provided by an LLVM project - ccCFlags="$ccCFlags -B$basePath" - ccCFlags="$ccCFlags -isystem$cc/lib/clang/$ccVersion/include" - fi - echo "$ccLDFlags" > $out/nix-support/cc-ldflags echo "$ccCFlags" > $out/nix-support/cc-cflags