Merge pull request #132269 from collares/ecl-boehmgc

ecl: make sure boehmgc is available to gcc/linker
This commit is contained in:
Jörg Thalheim 2021-08-01 07:55:59 +01:00 committed by GitHub
commit 6300316079
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -47,20 +47,24 @@ stdenv.mkDerivation {
(if threadSupport then "--enable-threads" else "--disable-threads")
"--with-gmp-prefix=${gmp.dev}"
"--with-libffi-prefix=${libffi.dev}"
]
++
(lib.optional (! noUnicode)
"--enable-unicode")
;
]
++
(lib.optional useBoehmgc
"--with-libgc-prefix=${boehmgc.dev}")
++
(lib.optional (! noUnicode)
"--enable-unicode")
;
hardeningDisable = [ "format" ];
postInstall = ''
postInstall = let
ldArgs = lib.strings.concatMapStringsSep " "
(l: ''--prefix NIX_LDFLAGS ' ' "-L${l.lib or l.out or l}/lib"'')
([ gmp libffi ] ++ lib.optional useBoehmgc boehmgc);
in ''
sed -e 's/@[-a-zA-Z_]*@//g' -i $out/bin/ecl-config
wrapProgram "$out/bin/ecl" \
--prefix PATH ':' "${gcc}/bin" \
--prefix NIX_LDFLAGS ' ' "-L${gmp.lib or gmp.out or gmp}/lib" \
--prefix NIX_LDFLAGS ' ' "-L${libffi.lib or libffi.out or libffi}/lib"
wrapProgram "$out/bin/ecl" --prefix PATH ':' "${gcc}/bin" ${ldArgs}
'';
meta = {