diff options
author | Shea Levy <shea@shealevy.com> | 2018-03-08 13:56:36 -0500 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2018-03-08 13:56:36 -0500 |
commit | c69d8bf5e606915820b30d6db8fa9dfa39766f67 (patch) | |
tree | 2a183cea5326f2095b082f4ac274c553faf35c53 /pkgs/build-support/cc-wrapper/default.nix | |
parent | fe565510cb6d090b19e7a263133ca1a841135c9b (diff) | |
download | nixlib-c69d8bf5e606915820b30d6db8fa9dfa39766f67.tar nixlib-c69d8bf5e606915820b30d6db8fa9dfa39766f67.tar.gz nixlib-c69d8bf5e606915820b30d6db8fa9dfa39766f67.tar.bz2 nixlib-c69d8bf5e606915820b30d6db8fa9dfa39766f67.tar.lz nixlib-c69d8bf5e606915820b30d6db8fa9dfa39766f67.tar.xz nixlib-c69d8bf5e606915820b30d6db8fa9dfa39766f67.tar.zst nixlib-c69d8bf5e606915820b30d6db8fa9dfa39766f67.zip |
treewide: Remove gnat support.
See discussion in https://github.com/NixOS/nixpkgs/commit/6ac7b19c978e951c124c5ea434c94f95f593888e.
Diffstat (limited to 'pkgs/build-support/cc-wrapper/default.nix')
-rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index ba8aca87c72b..43cd87fb4597 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -8,7 +8,7 @@ { name ? "" , stdenvNoCC, nativeTools, propagateDoc ? !nativeTools, noLibc ? false, nativeLibc, nativePrefix ? "" , cc ? null, libc ? null, bintools, coreutils ? null, shell ? stdenvNoCC.shell -, zlib ? null, extraPackages ? [], extraBuildCommands ? "" +, extraPackages ? [], extraBuildCommands ? "" , isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null , buildPackages ? {} }: @@ -21,9 +21,6 @@ assert !nativeTools -> assert !(nativeLibc && noLibc); assert (noLibc || nativeLibc) == (libc == null); -# For ghdl (the vhdl language provider to gcc) we need zlib in the wrapper. -assert cc.langVhdl or false -> zlib != null; - let stdenv = stdenvNoCC; inherit (stdenv) hostPlatform targetPlatform; @@ -189,17 +186,6 @@ stdenv.mkDerivation { + optionalString cc.langGo or false '' wrap ${targetPrefix}gccgo ${./cc-wrapper.sh} $ccPath/${targetPrefix}gccgo - '' - - + optionalString cc.langAda or false '' - wrap ${targetPrefix}gnatgcc ${./cc-wrapper.sh} $ccPath/${targetPrefix}gnatgcc - wrap ${targetPrefix}gnatmake ${./gnat-wrapper.sh} $ccPath/${targetPrefix}gnatmake - wrap ${targetPrefix}gnatbind ${./gnat-wrapper.sh} $ccPath/${targetPrefix}gnatbind - wrap ${targetPrefix}gnatlink ${./gnatlink-wrapper.sh} $ccPath/${targetPrefix}gnatlink - '' - - + optionalString cc.langVhdl or false '' - ln -s $ccPath/${targetPrefix}ghdl $out/bin/${targetPrefix}ghdl ''; propagatedBuildInputs = [ bintools ]; @@ -262,18 +248,6 @@ stdenv.mkDerivation { ccLDFlags+=" -L${cc_solib}/lib" ccCFlags+=" -B${cc_solib}/lib" - ${optionalString cc.langVhdl or false '' - ccLDFlags+=" -L${zlib.out}/lib" - ''} - - # Find the gcc libraries path (may work only without multilib). - ${optionalString cc.langAda or false '' - basePath=`echo ${cc_solib}/lib/*/*/*` - ccCFlags+=" -B$basePath -I$basePath/adainclude" - gnatCFlags="-aI$basePath/adainclude -aO$basePath/adalib" - echo "$gnatCFlags" > $out/nix-support/gnat-cflags - ''} - echo "$ccLDFlags" > $out/nix-support/cc-ldflags echo "$ccCFlags" > $out/nix-support/cc-cflags '' |