Joachim Fasting 2017-02-08 04:09:48 +01:00
parent ae33b4673d
commit a9c347b9e3
No known key found for this signature in database
GPG Key ID: 7544761007FE4E08

View File

@ -1,14 +1,11 @@
{ stdenv, fetchFromRepoOrCz, perl, texinfo }: { stdenv, fetchFromRepoOrCz, perl, texinfo }:
assert (stdenv.isGlibc);
with stdenv.lib; with stdenv.lib;
let let
date = "20160525"; date = "20170108";
version = "0.9.27pre-${date}"; version = "0.9.27pre-${date}";
rev = "1ca685f887310b5cbdc415cdfc3a578dbc8d82d8"; rev = "5420bb8a67f5f782ac49c90afb7da178a60c448a";
sha256 = "149s847jkg2zdmk09h0cp0q69m8kxxci441zyw8b08fy9b87ayd8"; sha256 = "0gf1ys4vv5qfkh6462fkdv44mz5chhrchlvgcl0m44f8mm8cjwa3";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -20,8 +17,6 @@ stdenv.mkDerivation rec {
inherit sha256; inherit sha256;
}; };
outputs = [ "bin" "dev" "out" ];
nativeBuildInputs = [ perl texinfo ]; nativeBuildInputs = [ perl texinfo ];
hardeningDisable = [ "fortify" ]; hardeningDisable = [ "fortify" ];
@ -32,17 +27,20 @@ stdenv.mkDerivation rec {
''; '';
preConfigure = '' preConfigure = ''
configureFlagsArray+=("--elfinterp=$(cat $NIX_CC/nix-support/dynamic-linker)") echo ${version} > VERSION
configureFlagsArray+=("--crtprefix=${stdenv.glibc.out}/lib")
configureFlagsArray+=("--sysincludepaths=${stdenv.glibc.dev}/include:{B}/include") configureFlagsArray+=("--cc=cc")
configureFlagsArray+=("--libpaths=${stdenv.glibc.out}/lib") configureFlagsArray+=("--elfinterp=$(< $NIX_CC/nix-support/dynamic-linker)")
configureFlagsArray+=("--crtprefix=${getLib stdenv.cc.libc}/lib")
configureFlagsArray+=("--sysincludepaths=${getDev stdenv.cc.libc}/include:{B}/include")
configureFlagsArray+=("--libpaths=${getLib stdenv.cc.libc}/lib")
''; '';
doCheck = true; doCheck = true;
checkTarget = "test"; checkTarget = "test";
postFixup = '' postFixup = ''
paxmark m $bin/bin/tcc paxmark m $out/bin/tcc
''; '';
meta = { meta = {