Skip to content

Commit 2ccce0a

Browse files
committed
Merge remote-tracking branch 'origin/master' into hkm/aarch64-darwin-eval
2 parents a01cff7 + e5ee170 commit 2ccce0a

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

compiler/ghc/default.nix

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ let
400400
" '*.*.ghc.*.opts += -fPIC' '*.*.cc.*.opts += -fPIC'"
401401
# C options for wasm
402402
+ lib.optionalString targetPlatform.isWasm (
403-
" 'stage1.*.ghc.*.opts += -optc-Wno-error=int-conversion -optc-O3 -optc-mcpu=lime1 -optc-mreference-types -optc-msimd128 -optc-mtail-call -optc-DXXH_NO_XXH3'"
403+
" 'stage1.*.ghc.*.opts += -optc-Wno-error=int-conversion -optc-O3 -optc-mcpu=lime1 -optc-mreference-types -optc-msimd128 -optc-DXXH_NO_XXH3'"
404404
+ " 'stage1.*.ghc.cpp.opts += -optc-fno-exceptions'")
405405
# `-fexternal-dynamic-refs` causes `undefined reference` errors when building GHC cross compiler for windows
406406
+ lib.optionalString (enableRelocatedStaticLibs && targetPlatform.isx86_64 && !targetPlatform.isWindows)
@@ -629,7 +629,6 @@ haskell-nix.haskellLib.makeCompilerDeps (stdenv.mkDerivation (rec {
629629
if builtins.compareVersions ghc-version "9.13" < 0
630630
then "--experimental-wasm-type-reflection"
631631
else "--max-old-space-size=65536"} \
632-
--no-turbo-fast-api-calls \
633632
--wasm-lazy-validation \
634633
"$SCRIPT" \
635634
"${lib-wasm}/lib" \

flake.lock

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)