Skip to content

haskell: make generic builder follow compiler’s shared config #42311

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

Merged
Ericson2314 merged 1 commit into from
Jun 21, 2018
Merged

haskell: make generic builder follow compiler’s shared config #42311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion pkgs/development/compilers/ghc/7.10.3-binary.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,10 @@ stdenv.mkDerivation rec {
[ $(./main) == "yes" ]
'';

passthru = { targetPrefix = ""; };
passthru = {
targetPrefix = "";
enableShared = true;
};

meta.license = stdenv.lib.licenses.bsd3;
meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "armv7l-linux"];
Expand Down
1 change: 1 addition & 0 deletions pkgs/development/compilers/ghc/7.10.3.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ stdenv.mkDerivation rec {
inherit bootPkgs targetPrefix;

inherit llvmPackages;
inherit enableShared;

# Our Cabal compiler name
haskellCompilerName = "ghc-7.10.3";
Expand Down
1 change: 1 addition & 0 deletions pkgs/development/compilers/ghc/8.0.2.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ stdenv.mkDerivation rec {
inherit bootPkgs targetPrefix;

inherit llvmPackages;
inherit enableShared;

# Our Cabal compiler name
haskellCompilerName = "ghc-8.0.2";
Expand Down
5 changes: 4 additions & 1 deletion pkgs/development/compilers/ghc/8.2.1-binary.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,10 @@ stdenv.mkDerivation rec {
[ $(./main) == "yes" ]
'';

passthru = { targetPrefix = ""; };
passthru = {
targetPrefix = "";
enableShared = true;
};

meta.license = stdenv.lib.licenses.bsd3;
# AArch64 should work in theory but eventually some builds start segfaulting
Expand Down
1 change: 1 addition & 0 deletions pkgs/development/compilers/ghc/8.2.2.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ stdenv.mkDerivation rec {
inherit bootPkgs targetPrefix;

inherit llvmPackages;
inherit enableShared;

# Our Cabal compiler name
haskellCompilerName = "ghc-8.2.2";
Expand Down
1 change: 1 addition & 0 deletions pkgs/development/compilers/ghc/8.4.3.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ stdenv.mkDerivation rec {
inherit bootPkgs targetPrefix;

inherit llvmPackages;
inherit enableShared;

# Our Cabal compiler name
haskellCompilerName = "ghc-8.4.3";
Expand Down
1 change: 1 addition & 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 @@ -191,6 +191,7 @@ stdenv.mkDerivation rec {
inherit bootPkgs targetPrefix;

inherit llvmPackages;
inherit enableShared;

# Our Cabal compiler name
haskellCompilerName = "ghc-8.5";
Expand Down
3 changes: 2 additions & 1 deletion pkgs/development/compilers/ghcjs-ng/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ let
inherit (bootGhcjs) version;
isGhcjs = true;

enableShared = true;

socket-io = nodePackages."socket.io";

# Relics of the old GHCJS build system
Expand Down Expand Up @@ -96,4 +98,3 @@ in stdenv.mkDerivation {

meta.platforms = passthru.bootPkgs.ghc.meta.platforms;
}

2 changes: 2 additions & 0 deletions pkgs/development/compilers/ghcjs/base.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,8 @@ in mkDerivation (rec {
# let us assume ghcjs is never actually cross compiled
targetPrefix = "";

enableShared = true;

inherit stage1Packages;
mkStage2 = stage2 {
inherit ghcjsBoot;
Expand Down
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 @@ -30,7 +30,7 @@ in
, profilingDetail ? "all-functions"
# TODO enable shared libs for cross-compiling
, enableSharedExecutables ? false
, enableSharedLibraries ? ((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version)
, enableSharedLibraries ? (ghc.enableShared or false)
, enableDeadCodeElimination ? (!stdenv.isDarwin) # TODO: use -dead_strip for darwin
, enableStaticLibraries ? !hostPlatform.isWindows
, enableHsc2hsViaAsm ? hostPlatform.isWindows && stdenv.lib.versionAtLeast ghc.version "8.4"
Expand Down