Skip to content

Commit 3623f1b

Browse files
committed
proper parens
1 parent 746a154 commit 3623f1b

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

compiler/ghc/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ let
325325
# The fact that we need to set this here is pretty idiotic. GHC should figure this out on it's own.
326326
# Either have a runtime flag/setting to disable it or if dlopen fails, remember that it failed and
327327
# fall back to non-dynamic. We only have x86_64 dynamic linker with musl.
328-
+ lib.optionalString targetPlatform.isAndroid || (targetPlatform.isMusl && !targetPlatform.isx86)
328+
+ lib.optionalString (targetPlatform.isAndroid || (targetPlatform.isMusl && !targetPlatform.isx86))
329329
" '*.ghc.cabal.configure.opts += --flags=-dynamic-system-linker'"
330330
# The following is required if we build on aarch64-darwin for aarch64-iOS. Otherwise older
331331
# iPhones/iPads/... won't understand the compiled code, as the compiler will emit LDSETALH

overlays/patches/ghc/ghc-9.6-missing-symbols-deadbeef.patch

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,15 @@ index 4d0c978..96a9d60 100644
1212
}
1313
}
1414
} else {
15+
diff --git a/rts/Linker.c b/rts/Linker.c
16+
index 2356818..727e845 100644
17+
--- a/rts/Linker.c
18+
+++ b/rts/Linker.c
19+
@@ -1088,6 +1088,7 @@ SymbolAddr* lookupSymbol( SymbolName* lbl )
20+
"See top entry above.\n", lbl);
21+
IF_DEBUG(linker, printLoadedObjects());
22+
fflush(stderr);
23+
+ r = 0xDEADBEEF;
24+
}
25+
26+
if (!runPendingInitializers()) {

0 commit comments

Comments
 (0)