haskell generic-builder: Don't use absolute path to tools, and also track strip

This commit is contained in:
John Ericson 2017-09-22 19:09:39 -04:00 committed by John Ericson
parent faa4b45a1e
commit bc066466fb

View File

@ -111,9 +111,10 @@ let
crossCabalFlags = [
"--with-ghc=${ghc.targetPrefix}ghc"
"--with-ghc-pkg=${ghc.targetPrefix}ghc-pkg"
"--with-gcc=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"
"--with-ld=${stdenv.cc.bintools}/bin/${stdenv.cc.bintools.targetPrefix}ld"
"--with-hsc2hs=${nativeGhc}/bin/hsc2hs"
"--with-gcc=${stdenv.cc.targetPrefix}cc"
"--with-ld=${stdenv.cc.bintools.targetPrefix}ld"
"--with-hsc2hs=${nativeGhc}/bin/hsc2hs" # not cross one
"--with-strip=${stdenv.cc.bintools.targetPrefix}strip"
] ++ (if isHaLVM then [] else ["--hsc2hs-options=--cross-compile"]);
crossCabalFlagsString =