diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
| commit | 623ee73d661e5ed8475cb264511f683407d87365 (patch) | |
| tree | 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /dev-lang/ghc/files | |
| parent | ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff) | |
gentoo Easter resync : 12.04.2020
Diffstat (limited to 'dev-lang/ghc/files')
| -rw-r--r-- | dev-lang/ghc/files/ghc-8.10.1-allow-cross-bootstrap.patch | 17 | ||||
| -rw-r--r-- | dev-lang/ghc/files/ghc-8.10.1-no-relax-everywhere.patch | 19 |
2 files changed, 36 insertions, 0 deletions
diff --git a/dev-lang/ghc/files/ghc-8.10.1-allow-cross-bootstrap.patch b/dev-lang/ghc/files/ghc-8.10.1-allow-cross-bootstrap.patch new file mode 100644 index 000000000000..7495cc8bff8d --- /dev/null +++ b/dev-lang/ghc/files/ghc-8.10.1-allow-cross-bootstrap.patch @@ -0,0 +1,17 @@ +Allow using cross-compilers to bootstrap GHC. + +In my case I'm using "cross"-compiler from +x86_64-unknown-linux to x86_64-HEAD-linux. + +Those targets have the same ABI and can boot one another. +--- a/configure.ac ++++ b/configure.ac +@@ -219,7 +219,7 @@ then + echo "This GHC (${WithGhc}) does not generate code for the build platform" + echo " GHC target platform : $bootstrap_target" + echo " Desired build platform : $BuildPlatform" +- exit 1 ++ #exit 1 + fi + + # Testing if we shall enable shared libs support on Solaris. diff --git a/dev-lang/ghc/files/ghc-8.10.1-no-relax-everywhere.patch b/dev-lang/ghc/files/ghc-8.10.1-no-relax-everywhere.patch new file mode 100644 index 000000000000..19c8b4bccc48 --- /dev/null +++ b/dev-lang/ghc/files/ghc-8.10.1-no-relax-everywhere.patch @@ -0,0 +1,19 @@ +https://github.com/gentoo-haskell/gentoo-haskell/issues/704 + +Allow users to specify -W,--relax externally and pass +-Wl,-no-relax unconditonally on all arches. + +Reported-by: wmyrda +--- a/compiler/main/DriverPipeline.hs ++++ b/compiler/main/DriverPipeline.hs +@@ -2144,9 +2144,7 @@ joinObjectFiles dflags o_files output_fn = do + -- gcc on sparc sets -Wl,--relax implicitly, but + -- -r and --relax are incompatible for ld, so + -- disable --relax explicitly. +- ++ (if platformArch (targetPlatform dflags) +- `elem` [ArchSPARC, ArchSPARC64] +- && ldIsGnuLd ++ ++ (if ldIsGnuLd + then [SysTools.Option "-Wl,-no-relax"] + else []) + -- See Note [Produce big objects on Windows] |