@@ -43,13 +43,15 @@ let
43 kill $RISERV_PID
43 kill $RISERV_PID
45 configureFlags = lib.optional hostPlatform.isAarch32 "--disable-split-sections";
45 configureFlags = lib.optional hostPlatform.isAarch32 "--disable-split-sections";
46− setupBuildFlags = map (opt: "--ghc-option=" + opt) (lib.optionals isLinuxCross
46+ setupBuildFlags = map (opt: "--ghc-option=" + opt) ((lib.optionals isLinuxCross
47 [ "-fexternal-interpreter"
47 [ "-fexternal-interpreter"
48 "-pgmi" "${qemuIservWrapper}/bin/iserv-wrapper"
48 "-pgmi" "${qemuIservWrapper}/bin/iserv-wrapper"
49 "-L${gmp}/lib"
49 "-L${gmp}/lib"
50− ]) ++ lib.optionals hostPlatform.isAarch32 (map (opt: "--gcc-option=" + opt) [ "-fno-pic" "-fno-plt" ])
51− # Required to work-around https://gitlab.haskell.org/ghc/ghc/issues/15275
50+ # Required to work-around https://gitlab.haskell.org/ghc/ghc/issues/15275
52− ++ lib.optionals hostPlatform.isAarch64 [ "-fPIC" "--gcc-option=-fPIC" ];
51+ ] ++ lib.optionals hostPlatform.isAarch64 ["-fPIC"]))
52+ ++ lib.optionals hostPlatform.isAarch32 (map (opt: "--gcc-option=" + opt) [ "-fno-pic" "-fno-plt" ])
53+ # Also for GHC #15275
54+ ++ lib.optionals hostPlatform.isAarch64 ["--gcc-option=-fPIC"];
53 qemuTestWrapper = writeScriptBin "test-wrapper" ''
55 qemuTestWrapper = writeScriptBin "test-wrapper" ''
54 #!${stdenv.shell}
56 #!${stdenv.shell}
55 set -euo pipefail
57 set -euo pipefail