git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
fix: not use ld.gold on aarch32 (#548)
dc3d1a7Le Tuan
builder/comp-builder.nix+2−1
compare with iko/ghcjs-patch-master
unifiedsplit
@@ -75,8 +75,9 @@ let
75 [ "--with-gcc=${stdenv.cc.targetPrefix}cc"
75 [ "--with-gcc=${stdenv.cc.targetPrefix}cc"
76 ] ++
76 ] ++
77 # BINTOOLS
77 # BINTOOLS
78− (if stdenv.hostPlatform.isLinux
78+ (if stdenv.hostPlatform.isLinux && !stdenv.targetPlatform.isAarch32
79 # use gold as the linker on linux to improve link times
79 # use gold as the linker on linux to improve link times
80+ # Causes segfaults on Aarch32 though.
80 then [
81 then [
81 "--with-ld=${stdenv.cc.bintools.targetPrefix}ld.gold"
82 "--with-ld=${stdenv.cc.bintools.targetPrefix}ld.gold"
82 "--ghc-option=-optl-fuse-ld=gold"
83 "--ghc-option=-optl-fuse-ld=gold"
compiler/ghc/default.nix+7−11
@@ -42,13 +42,7 @@
42 # specific flavour and falls back to ghc default values.
42 # specific flavour and falls back to ghc default values.
43 ghcFlavour ? stdenv.lib.optionalString haskell-nix.haskellLib.isCrossTarget (
43 ghcFlavour ? stdenv.lib.optionalString haskell-nix.haskellLib.isCrossTarget (
44 if useLLVM
44 if useLLVM
45− then (
46− # TODO check if the issues with qemu and Aarch32 persist. See
47− # https://github.com/input-output-hk/haskell.nix/pull/411/commits/1986264683067198e7fdc1d665351622b664712e
48− if stdenv.targetPlatform.isAarch32
49− then "quick-cross"
50− else "perf-cross"
45+ then "perf-cross"
51− )
52 else "perf-cross-ncg"
46 else "perf-cross-ncg"
53 )
47 )
54
48
@@ -218,13 +212,15 @@ in let configured-src = stdenv.mkDerivation (rec {
218 "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
212 "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
219 ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
213 ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
220 "--enable-bootstrap-with-devel-snapshot"
214 "--enable-bootstrap-with-devel-snapshot"
221− ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [
222− "CFLAGS=-fuse-ld=gold"
223− "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
224− "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
225 ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [
215 ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [
226 "--disable-large-address-space"
216 "--disable-large-address-space"
227 ];
217 ];
218+ # FIXME Currently causes segfaults on armv6l cross-compilation.
219+ # ++ stdenv.lib.optionals (targetPlatform.isAarch32) [
220+ # "CFLAGS=-fuse-ld=gold"
221+ # "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
222+ # "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
223+ # ] ;
228
224
229 outputs = [ "out" ];
225 outputs = [ "out" ];
230 phases = [ "unpackPhase" "patchPhase" ]
226 phases = [ "unpackPhase" "patchPhase" ]