Merge pull request #57832 from athas/futhark-change-wrapping

futhark: only wrap the 'futhark' executable
This commit is contained in:
Peter Simons 2019-03-20 23:13:34 +01:00 committed by GitHub
commit 5530900d54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -536,10 +536,7 @@ self: super: builtins.intersectAttrs super {
let path = stdenv.lib.makeBinPath [ gcc ];
in overrideCabal (addBuildTool super.futhark makeWrapper) (_drv: {
postInstall = ''
wrapProgram $out/bin/futhark-c \
--prefix PATH : "${path}"
wrapProgram $out/bin/futhark-opencl \
wrapProgram $out/bin/futhark \
--prefix PATH : "${path}" \
--set NIX_CC_WRAPPER_x86_64_unknown_linux_gnu_TARGET_HOST 1 \
--set NIX_CFLAGS_COMPILE "-I${opencl-headers}/include" \