From e66de62beff0ff2587853d5d68a61e878c05129c Mon Sep 17 00:00:00 2001
From: Rodrigo Mesquita <rodrigo.m.mesquita@gmail.com>
Date: Tue, 22 Oct 2024 15:53:37 +0100
Subject: [PATCH] Fix -fobject-determinism flag definition
The flag should be defined as an fflag to make sure the
-fno-object-determinism flag is also an available option.
Fixes #25397
(cherry picked from commit 4a00731eda964ec551f920b0319b24db2073687c)
---
compiler/GHC/Driver/Session.hs | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/compiler/GHC/Driver/Session.hs b/compiler/GHC/Driver/Session.hs
index fd58f82d04c..2da2c9c6886 100644
--- a/compiler/GHC/Driver/Session.hs
+++ b/compiler/GHC/Driver/Session.hs
@@ -1291,8 +1291,6 @@ dynamic_flags_deps = [
(NoArg (unSetGeneralFlag Opt_KeepOFiles))
------- Miscellaneous ----------------------------------------------
- , make_ord_flag defGhcFlag "fobject-determinism"
- (NoArg (setGeneralFlag Opt_ObjectDeterminism))
, make_ord_flag defGhcFlag "no-auto-link-packages"
(NoArg (unSetGeneralFlag Opt_AutoLinkPackages))
, make_ord_flag defGhcFlag "no-hs-main"
@@ -2543,6 +2541,7 @@ fFlagsDeps = [
flagSpec "link-rts" Opt_LinkRts,
flagSpec "byte-code-and-object-code" Opt_ByteCodeAndObjectCode,
flagSpec "prefer-byte-code" Opt_UseBytecodeRatherThanObjects,
+ flagSpec "object-determinism" Opt_ObjectDeterminism,
flagSpec' "compact-unwind" Opt_CompactUnwind
(\turn_on -> updM (\dflags -> do
unless (platformOS (targetPlatform dflags) == OSDarwin && turn_on)
--
GitLab