Skip to content

ghc cross #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
expipiplus1 wants to merge 4 commits into from
Closed

ghc cross #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3ac3f09
ghc-cross: set STRIP_CMD and dontStrip
expipiplus1 Jul 15, 2017
5148d68
haskell-packages: Do no run haddock for cross builds
expipiplus1 Jul 15, 2017
25b9110
devmem2: Use $CC instead of cc
expipiplus1 Jul 15, 2017
fc40d88
file: Disable tests when cross compiling
expipiplus1 Jul 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions pkgs/development/compilers/ghc/head.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ in stdenv.mkDerivation (rec {
preConfigure = stdenv.lib.optionalString (targetPlatform != hostPlatform)''
sed 's|#BuildFlavour = quick-cross|BuildFlavour = perf-cross|' mk/build.mk.sample > mk/build.mk
echo 'Stage1Only = YES' >> mk/build.mk
echo 'STRIP_CMD = ${binutils}/bin/${prefix}strip' >> mk/build.mk
'' + stdenv.lib.optionalString (targetPlatform != hostPlatform && dynamic) ''
echo 'DYNAMIC_GHC_PROGRAMS = YES' >> mk/build.mk
'' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
Expand Down Expand Up @@ -234,4 +235,9 @@ in stdenv.mkDerivation (rec {
patches = [
./android-patches/enable-fPIC.patch
];
} // stdenv.lib.optionalAttrs (buildPlatform != targetPlatform) {
# Nix uses the native strip on libraries, leading to error like this
# https://github.com/neurocyte/ghc-android/issues/29
dontStrip = true;
dontCrossStrip = true;
})
2 changes: 1 addition & 1 deletion pkgs/development/haskell-modules/generic-builder.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ in
, license
, maintainers ? []
, doCoverage ? false
, doHaddock ? !(ghc.isHaLVM or false)
, doHaddock ? !(isCross || ghc.isHaLVM or false)
, passthru ? {}
, pkgconfigDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? [], benchmarkPkgconfigDepends ? []
, testDepends ? [], testHaskellDepends ? [], testSystemDepends ? []
Expand Down
2 changes: 1 addition & 1 deletion pkgs/os-specific/linux/devmem2/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ stdenv.mkDerivation rec {

buildCommand = ''
export hardeningDisable=format # fix compile error
cc "$src" -o devmem2
$CC "$src" -o devmem2
install -D devmem2 "$out/bin/devmem2"
'';

Expand Down
7 changes: 3 additions & 4 deletions pkgs/tools/misc/file/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, zlib }:
{ stdenv, fetchurl, zlib, lib, buildPackages, buildPlatform, hostPlatform}:

stdenv.mkDerivation rec {
name = "file-${version}";
Expand All @@ -12,10 +12,9 @@ stdenv.mkDerivation rec {
sha256 = "1vp4zihaxkhi85chkjgd4r4zdg4k2wa3c6pmajhbmx6gr7d8ii89";
};

buildInputs = [ zlib ];

doCheck = true;
buildInputs = [ zlib ] ++ lib.optionals (buildPlatform != hostPlatform) [ buildPackages.file ];

doCheck = buildPlatform == hostPlatform;

meta = with stdenv.lib; {
homepage = "http://darwinsys.com/file";
Expand Down