Magnus pushed to branch wip/mangoiv/improve-linker-discovery at Glasgow Haskell Compiler / GHC

Commits:

2 changed files:

Changes:

  • .gitlab/generate-ci/gen_ci.hs
    ... ... @@ -182,7 +182,7 @@ configureArgsStr bc = unwords $
    182 182
       ++ ["--with-intree-gmp" | Just _ <- [crossTarget bc] ]
    
    183 183
       ++ ["--with-system-libffi" | crossTarget bc == Just "wasm32-wasi" ]
    
    184 184
       ++ ["--enable-ipe-data-compression" | withZstd bc ]
    
    185
    -  ++ ["--enable-strict-ghc-toolchain-check"]
    
    185
    +  -- ++ ["--enable-strict-ghc-toolchain-check"]
    
    186 186
     
    
    187 187
     -- Compute the hadrian flavour from the BuildConfig
    
    188 188
     mkJobFlavour :: BuildConfig -> Flavour
    

  • .gitlab/jobs.yaml
    ... ... @@ -56,7 +56,7 @@
    56 56
           "BIGNUM_BACKEND": "gmp",
    
    57 57
           "BIN_DIST_NAME": "ghc-aarch64-darwin-validate",
    
    58 58
           "BUILD_FLAVOUR": "validate",
    
    59
    -      "CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check",
    
    59
    +      "CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi ",
    
    60 60
           "HADRIAN_ARGS": "--docs=no-sphinx-pdfs",
    
    61 61
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    62 62
           "LANG": "en_US.UTF-8",
    
    ... ... @@ -124,7 +124,7 @@
    124 124
           "BIN_DIST_NAME": "ghc-aarch64-linux-alpine3_23-validate",
    
    125 125
           "BROKEN_TESTS": "encoding004 T10458",
    
    126 126
           "BUILD_FLAVOUR": "validate",
    
    127
    -      "CONFIGURE_ARGS": "--disable-ld-override --enable-ignore-build-platform-mismatch --build=aarch64-unknown-linux --host=aarch64-unknown-linux --target=aarch64-unknown-linux --enable-strict-ghc-toolchain-check",
    
    127
    +      "CONFIGURE_ARGS": "--disable-ld-override --enable-ignore-build-platform-mismatch --build=aarch64-unknown-linux --host=aarch64-unknown-linux --target=aarch64-unknown-linux ",
    
    128 128
           "INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
    
    129 129
           "RUNTEST_ARGS": "",
    
    130 130
           "TEST_ENV": "aarch64-linux-alpine3_23-validate",
    
    ... ... @@ -187,7 +187,7 @@
    187 187
           "BIGNUM_BACKEND": "gmp",
    
    188 188
           "BIN_DIST_NAME": "ghc-aarch64-linux-deb11-validate",
    
    189 189
           "BUILD_FLAVOUR": "validate",
    
    190
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    190
    +      "CONFIGURE_ARGS": "",
    
    191 191
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    192 192
           "RUNTEST_ARGS": "",
    
    193 193
           "TEST_ENV": "aarch64-linux-deb11-validate",
    
    ... ... @@ -250,7 +250,7 @@
    250 250
           "BIGNUM_BACKEND": "gmp",
    
    251 251
           "BIN_DIST_NAME": "ghc-aarch64-linux-deb12-validate",
    
    252 252
           "BUILD_FLAVOUR": "validate",
    
    253
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    253
    +      "CONFIGURE_ARGS": "",
    
    254 254
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    255 255
           "RUNTEST_ARGS": "",
    
    256 256
           "TEST_ENV": "aarch64-linux-deb12-validate",
    
    ... ... @@ -316,7 +316,7 @@
    316 316
           "BUILD_FLAVOUR": "validate",
    
    317 317
           "CC": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-clang",
    
    318 318
           "CFLAGS": "-fuse-ld=/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-ld --rtlib=compiler-rt",
    
    319
    -      "CONFIGURE_ARGS": "--with-intree-gmp --enable-strict-ghc-toolchain-check",
    
    319
    +      "CONFIGURE_ARGS": "--with-intree-gmp",
    
    320 320
           "CONF_CC_OPTS_STAGE2": "-fuse-ld=/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-ld --rtlib=compiler-rt",
    
    321 321
           "CROSS_EMULATOR": "/opt/wine-arm64ec-msys2-deb12/bin/wine",
    
    322 322
           "CROSS_STAGE": "2",
    
    ... ... @@ -400,7 +400,7 @@
    400 400
           "BUILD_FLAVOUR": "validate+llvm",
    
    401 401
           "CC": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-clang",
    
    402 402
           "CFLAGS": "-fuse-ld=/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-ld --rtlib=compiler-rt",
    
    403
    -      "CONFIGURE_ARGS": "--with-intree-gmp --enable-strict-ghc-toolchain-check",
    
    403
    +      "CONFIGURE_ARGS": "--with-intree-gmp",
    
    404 404
           "CONF_CC_OPTS_STAGE2": "-fuse-ld=/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-ld --rtlib=compiler-rt",
    
    405 405
           "CROSS_EMULATOR": "/opt/wine-arm64ec-msys2-deb12/bin/wine",
    
    406 406
           "CROSS_STAGE": "2",
    
    ... ... @@ -481,7 +481,7 @@
    481 481
           "BIGNUM_BACKEND": "gmp",
    
    482 482
           "BIN_DIST_NAME": "ghc-aarch64-linux-deb13-validate",
    
    483 483
           "BUILD_FLAVOUR": "validate",
    
    484
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    484
    +      "CONFIGURE_ARGS": "",
    
    485 485
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    486 486
           "RUNTEST_ARGS": "",
    
    487 487
           "TEST_ENV": "aarch64-linux-deb13-validate",
    
    ... ... @@ -544,7 +544,7 @@
    544 544
           "BIGNUM_BACKEND": "gmp",
    
    545 545
           "BIN_DIST_NAME": "ghc-aarch64-linux-deb13-validate+llvm",
    
    546 546
           "BUILD_FLAVOUR": "validate+llvm",
    
    547
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    547
    +      "CONFIGURE_ARGS": "",
    
    548 548
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    549 549
           "RUNTEST_ARGS": "",
    
    550 550
           "TEST_ENV": "aarch64-linux-deb13-validate+llvm",
    
    ... ... @@ -608,7 +608,7 @@
    608 608
           "BIN_DIST_NAME": "ghc-i386-linux-alpine3_23-validate",
    
    609 609
           "BROKEN_TESTS": "encoding004 T10458 simd009 T25169",
    
    610 610
           "BUILD_FLAVOUR": "validate",
    
    611
    -      "CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
    
    611
    +      "CONFIGURE_ARGS": "--disable-ld-override ",
    
    612 612
           "INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
    
    613 613
           "RUNTEST_ARGS": "",
    
    614 614
           "TEST_ENV": "i386-linux-alpine3_23-validate",
    
    ... ... @@ -671,7 +671,7 @@
    671 671
           "BIGNUM_BACKEND": "gmp",
    
    672 672
           "BIN_DIST_NAME": "ghc-i386-linux-deb11-validate",
    
    673 673
           "BUILD_FLAVOUR": "validate",
    
    674
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    674
    +      "CONFIGURE_ARGS": "",
    
    675 675
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    676 676
           "RUNTEST_ARGS": "",
    
    677 677
           "TEST_ENV": "i386-linux-deb11-validate",
    
    ... ... @@ -734,7 +734,7 @@
    734 734
           "BIGNUM_BACKEND": "gmp",
    
    735 735
           "BIN_DIST_NAME": "ghc-i386-linux-deb12-validate",
    
    736 736
           "BUILD_FLAVOUR": "validate",
    
    737
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    737
    +      "CONFIGURE_ARGS": "",
    
    738 738
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    739 739
           "RUNTEST_ARGS": "",
    
    740 740
           "TEST_ENV": "i386-linux-deb12-validate",
    
    ... ... @@ -797,7 +797,7 @@
    797 797
           "BIGNUM_BACKEND": "gmp",
    
    798 798
           "BIN_DIST_NAME": "ghc-i386-linux-deb13-validate",
    
    799 799
           "BUILD_FLAVOUR": "validate",
    
    800
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    800
    +      "CONFIGURE_ARGS": "",
    
    801 801
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    802 802
           "RUNTEST_ARGS": "",
    
    803 803
           "TEST_ENV": "i386-linux-deb13-validate",
    
    ... ... @@ -860,7 +860,7 @@
    860 860
           "BIGNUM_BACKEND": "gmp",
    
    861 861
           "BIN_DIST_NAME": "ghc-aarch64-darwin-validate",
    
    862 862
           "BUILD_FLAVOUR": "validate",
    
    863
    -      "CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check",
    
    863
    +      "CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi ",
    
    864 864
           "HADRIAN_ARGS": "--docs=no-sphinx-pdfs",
    
    865 865
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    866 866
           "LANG": "en_US.UTF-8",
    
    ... ... @@ -929,7 +929,7 @@
    929 929
           "BIN_DIST_NAME": "ghc-aarch64-linux-alpine3_23-validate",
    
    930 930
           "BROKEN_TESTS": "encoding004 T10458",
    
    931 931
           "BUILD_FLAVOUR": "validate",
    
    932
    -      "CONFIGURE_ARGS": "--disable-ld-override --enable-ignore-build-platform-mismatch --build=aarch64-unknown-linux --host=aarch64-unknown-linux --target=aarch64-unknown-linux --enable-strict-ghc-toolchain-check",
    
    932
    +      "CONFIGURE_ARGS": "--disable-ld-override --enable-ignore-build-platform-mismatch --build=aarch64-unknown-linux --host=aarch64-unknown-linux --target=aarch64-unknown-linux ",
    
    933 933
           "INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
    
    934 934
           "RUNTEST_ARGS": "",
    
    935 935
           "TEST_ENV": "aarch64-linux-alpine3_23-validate",
    
    ... ... @@ -993,7 +993,7 @@
    993 993
           "BIGNUM_BACKEND": "gmp",
    
    994 994
           "BIN_DIST_NAME": "ghc-aarch64-linux-deb11-validate",
    
    995 995
           "BUILD_FLAVOUR": "validate",
    
    996
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    996
    +      "CONFIGURE_ARGS": "",
    
    997 997
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    998 998
           "RUNTEST_ARGS": "",
    
    999 999
           "TEST_ENV": "aarch64-linux-deb11-validate",
    
    ... ... @@ -1057,7 +1057,7 @@
    1057 1057
           "BIGNUM_BACKEND": "gmp",
    
    1058 1058
           "BIN_DIST_NAME": "ghc-aarch64-linux-deb12-validate",
    
    1059 1059
           "BUILD_FLAVOUR": "validate",
    
    1060
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    1060
    +      "CONFIGURE_ARGS": "",
    
    1061 1061
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    1062 1062
           "RUNTEST_ARGS": "",
    
    1063 1063
           "TEST_ENV": "aarch64-linux-deb12-validate",
    
    ... ... @@ -1124,7 +1124,7 @@
    1124 1124
           "BUILD_FLAVOUR": "validate",
    
    1125 1125
           "CC": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-clang",
    
    1126 1126
           "CFLAGS": "-fuse-ld=/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-ld --rtlib=compiler-rt",
    
    1127
    -      "CONFIGURE_ARGS": "--with-intree-gmp --enable-strict-ghc-toolchain-check",
    
    1127
    +      "CONFIGURE_ARGS": "--with-intree-gmp",
    
    1128 1128
           "CONF_CC_OPTS_STAGE2": "-fuse-ld=/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-ld --rtlib=compiler-rt",
    
    1129 1129
           "CROSS_EMULATOR": "/opt/wine-arm64ec-msys2-deb12/bin/wine",
    
    1130 1130
           "CROSS_STAGE": "2",
    
    ... ... @@ -1209,7 +1209,7 @@
    1209 1209
           "BUILD_FLAVOUR": "validate+llvm",
    
    1210 1210
           "CC": "/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-clang",
    
    1211 1211
           "CFLAGS": "-fuse-ld=/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-ld --rtlib=compiler-rt",
    
    1212
    -      "CONFIGURE_ARGS": "--with-intree-gmp --enable-strict-ghc-toolchain-check",
    
    1212
    +      "CONFIGURE_ARGS": "--with-intree-gmp",
    
    1213 1213
           "CONF_CC_OPTS_STAGE2": "-fuse-ld=/opt/llvm-mingw-linux/bin/aarch64-w64-mingw32-ld --rtlib=compiler-rt",
    
    1214 1214
           "CROSS_EMULATOR": "/opt/wine-arm64ec-msys2-deb12/bin/wine",
    
    1215 1215
           "CROSS_STAGE": "2",
    
    ... ... @@ -1291,7 +1291,7 @@
    1291 1291
           "BIGNUM_BACKEND": "gmp",
    
    1292 1292
           "BIN_DIST_NAME": "ghc-aarch64-linux-deb13-validate",
    
    1293 1293
           "BUILD_FLAVOUR": "validate",
    
    1294
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    1294
    +      "CONFIGURE_ARGS": "",
    
    1295 1295
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    1296 1296
           "RUNTEST_ARGS": "",
    
    1297 1297
           "TEST_ENV": "aarch64-linux-deb13-validate",
    
    ... ... @@ -1355,7 +1355,7 @@
    1355 1355
           "BIGNUM_BACKEND": "gmp",
    
    1356 1356
           "BIN_DIST_NAME": "ghc-aarch64-linux-deb13-validate+llvm",
    
    1357 1357
           "BUILD_FLAVOUR": "validate+llvm",
    
    1358
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    1358
    +      "CONFIGURE_ARGS": "",
    
    1359 1359
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    1360 1360
           "RUNTEST_ARGS": "",
    
    1361 1361
           "TEST_ENV": "aarch64-linux-deb13-validate+llvm",
    
    ... ... @@ -1420,7 +1420,7 @@
    1420 1420
           "BIN_DIST_NAME": "ghc-i386-linux-alpine3_23-validate",
    
    1421 1421
           "BROKEN_TESTS": "encoding004 T10458 simd009 T25169",
    
    1422 1422
           "BUILD_FLAVOUR": "validate",
    
    1423
    -      "CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
    
    1423
    +      "CONFIGURE_ARGS": "--disable-ld-override ",
    
    1424 1424
           "INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
    
    1425 1425
           "RUNTEST_ARGS": "",
    
    1426 1426
           "TEST_ENV": "i386-linux-alpine3_23-validate",
    
    ... ... @@ -1484,7 +1484,7 @@
    1484 1484
           "BIGNUM_BACKEND": "gmp",
    
    1485 1485
           "BIN_DIST_NAME": "ghc-i386-linux-deb11-validate",
    
    1486 1486
           "BUILD_FLAVOUR": "validate",
    
    1487
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    1487
    +      "CONFIGURE_ARGS": "",
    
    1488 1488
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    1489 1489
           "RUNTEST_ARGS": "",
    
    1490 1490
           "TEST_ENV": "i386-linux-deb11-validate",
    
    ... ... @@ -1548,7 +1548,7 @@
    1548 1548
           "BIGNUM_BACKEND": "gmp",
    
    1549 1549
           "BIN_DIST_NAME": "ghc-i386-linux-deb12-validate",
    
    1550 1550
           "BUILD_FLAVOUR": "validate",
    
    1551
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    1551
    +      "CONFIGURE_ARGS": "",
    
    1552 1552
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    1553 1553
           "RUNTEST_ARGS": "",
    
    1554 1554
           "TEST_ENV": "i386-linux-deb12-validate",
    
    ... ... @@ -1612,7 +1612,7 @@
    1612 1612
           "BIGNUM_BACKEND": "gmp",
    
    1613 1613
           "BIN_DIST_NAME": "ghc-i386-linux-deb13-validate",
    
    1614 1614
           "BUILD_FLAVOUR": "validate",
    
    1615
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    1615
    +      "CONFIGURE_ARGS": "",
    
    1616 1616
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    1617 1617
           "RUNTEST_ARGS": "",
    
    1618 1618
           "TEST_ENV": "i386-linux-deb13-validate",
    
    ... ... @@ -1676,7 +1676,7 @@
    1676 1676
           "BIGNUM_BACKEND": "gmp",
    
    1677 1677
           "BIN_DIST_NAME": "ghc-x86_64-darwin-validate",
    
    1678 1678
           "BUILD_FLAVOUR": "validate",
    
    1679
    -      "CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check",
    
    1679
    +      "CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi ",
    
    1680 1680
           "HADRIAN_ARGS": "--docs=no-sphinx-pdfs",
    
    1681 1681
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    1682 1682
           "LANG": "en_US.UTF-8",
    
    ... ... @@ -1748,7 +1748,7 @@
    1748 1748
           "BUILD_FLAVOUR": "validate",
    
    1749 1749
           "CABAL_INSTALL_VERSION": "3.14.2.0",
    
    1750 1750
           "CC": "cc",
    
    1751
    -      "CONFIGURE_ARGS": "--with-iconv-includes=/usr/local/include --with-iconv-libraries=/usr/local/lib --with-system-libffi --with-ffi-includes=/usr/local/include --with-ffi-libraries=/usr/local/lib --with-gmp-includes=/usr/local/include --with-gmp-libraries=/usr/local/lib --enable-strict-ghc-toolchain-check",
    
    1751
    +      "CONFIGURE_ARGS": "--with-iconv-includes=/usr/local/include --with-iconv-libraries=/usr/local/lib --with-system-libffi --with-ffi-includes=/usr/local/include --with-ffi-libraries=/usr/local/lib --with-gmp-includes=/usr/local/include --with-gmp-libraries=/usr/local/lib ",
    
    1752 1752
           "CXX": "c++",
    
    1753 1753
           "FETCH_GHC_VERSION": "9.10.3",
    
    1754 1754
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    ... ... @@ -1815,7 +1815,7 @@
    1815 1815
           "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_12-int_native-validate+fully_static",
    
    1816 1816
           "BROKEN_TESTS": "ghcilink002 linker_unload_native encoding004 T10458",
    
    1817 1817
           "BUILD_FLAVOUR": "validate+fully_static",
    
    1818
    -      "CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
    
    1818
    +      "CONFIGURE_ARGS": "--disable-ld-override ",
    
    1819 1819
           "INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
    
    1820 1820
           "RUNTEST_ARGS": "",
    
    1821 1821
           "TEST_ENV": "x86_64-linux-alpine3_12-int_native-validate+fully_static",
    
    ... ... @@ -1880,7 +1880,7 @@
    1880 1880
           "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_12-validate+fully_static",
    
    1881 1881
           "BROKEN_TESTS": "ghcilink002 linker_unload_native encoding004 T10458",
    
    1882 1882
           "BUILD_FLAVOUR": "validate+fully_static",
    
    1883
    -      "CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
    
    1883
    +      "CONFIGURE_ARGS": "--disable-ld-override ",
    
    1884 1884
           "INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
    
    1885 1885
           "RUNTEST_ARGS": "",
    
    1886 1886
           "TEST_ENV": "x86_64-linux-alpine3_12-validate+fully_static",
    
    ... ... @@ -1945,7 +1945,7 @@
    1945 1945
           "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_23-validate",
    
    1946 1946
           "BROKEN_TESTS": "encoding004 T10458",
    
    1947 1947
           "BUILD_FLAVOUR": "validate",
    
    1948
    -      "CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
    
    1948
    +      "CONFIGURE_ARGS": "--disable-ld-override ",
    
    1949 1949
           "INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
    
    1950 1950
           "RUNTEST_ARGS": "",
    
    1951 1951
           "TEST_ENV": "x86_64-linux-alpine3_23-validate",
    
    ... ... @@ -2009,7 +2009,7 @@
    2009 2009
           "BIGNUM_BACKEND": "gmp",
    
    2010 2010
           "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_23-wasm-cross_wasm32-wasi-release+host_fully_static+text_simdutf",
    
    2011 2011
           "BUILD_FLAVOUR": "release+host_fully_static+text_simdutf",
    
    2012
    -      "CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check",
    
    2012
    +      "CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi",
    
    2013 2013
           "CROSS_STAGE": "2",
    
    2014 2014
           "CROSS_TARGET": "wasm32-wasi",
    
    2015 2015
           "FIREFOX_LAUNCH_OPTS": "{\"browser\":\"firefox\",\"executablePath\":\"/usr/bin/firefox\"}",
    
    ... ... @@ -2076,7 +2076,7 @@
    2076 2076
           "BIGNUM_BACKEND": "native",
    
    2077 2077
           "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_23-wasm-int_native-cross_wasm32-wasi-release+host_fully_static+text_simdutf",
    
    2078 2078
           "BUILD_FLAVOUR": "release+host_fully_static+text_simdutf",
    
    2079
    -      "CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check",
    
    2079
    +      "CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi",
    
    2080 2080
           "CROSS_STAGE": "2",
    
    2081 2081
           "CROSS_TARGET": "wasm32-wasi",
    
    2082 2082
           "FIREFOX_LAUNCH_OPTS": "{\"browser\":\"firefox\",\"executablePath\":\"/usr/bin/firefox\"}",
    
    ... ... @@ -2143,7 +2143,7 @@
    2143 2143
           "BIGNUM_BACKEND": "gmp",
    
    2144 2144
           "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_23-wasm-unreg-cross_wasm32-wasi-release+host_fully_static+text_simdutf",
    
    2145 2145
           "BUILD_FLAVOUR": "release+host_fully_static+text_simdutf",
    
    2146
    -      "CONFIGURE_ARGS": "--enable-unregisterised --with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check",
    
    2146
    +      "CONFIGURE_ARGS": "--enable-unregisterised --with-intree-gmp --with-system-libffi",
    
    2147 2147
           "CROSS_STAGE": "2",
    
    2148 2148
           "CROSS_TARGET": "wasm32-wasi",
    
    2149 2149
           "FIREFOX_LAUNCH_OPTS": "{\"browser\":\"firefox\",\"executablePath\":\"/usr/bin/firefox\"}",
    
    ... ... @@ -2210,7 +2210,7 @@
    2210 2210
           "BIGNUM_BACKEND": "native",
    
    2211 2211
           "BIN_DIST_NAME": "ghc-x86_64-linux-deb11-emsdk-closure-int_native-cross_javascript-unknown-ghcjs-validate",
    
    2212 2212
           "BUILD_FLAVOUR": "validate",
    
    2213
    -      "CONFIGURE_ARGS": "--with-intree-gmp --enable-strict-ghc-toolchain-check",
    
    2213
    +      "CONFIGURE_ARGS": "--with-intree-gmp",
    
    2214 2214
           "CONFIGURE_WRAPPER": "emconfigure",
    
    2215 2215
           "CROSS_STAGE": "2",
    
    2216 2216
           "CROSS_TARGET": "javascript-unknown-ghcjs",
    
    ... ... @@ -2277,7 +2277,7 @@
    2277 2277
           "BIGNUM_BACKEND": "gmp",
    
    2278 2278
           "BIN_DIST_NAME": "ghc-x86_64-linux-deb11-validate",
    
    2279 2279
           "BUILD_FLAVOUR": "validate",
    
    2280
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    2280
    +      "CONFIGURE_ARGS": "",
    
    2281 2281
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    2282 2282
           "RUNTEST_ARGS": "",
    
    2283 2283
           "TEST_ENV": "x86_64-linux-deb11-validate",
    
    ... ... @@ -2341,7 +2341,7 @@
    2341 2341
           "BIGNUM_BACKEND": "gmp",
    
    2342 2342
           "BIN_DIST_NAME": "ghc-x86_64-linux-deb11-validate+debug_info",
    
    2343 2343
           "BUILD_FLAVOUR": "validate+debug_info",
    
    2344
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    2344
    +      "CONFIGURE_ARGS": "",
    
    2345 2345
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    2346 2346
           "RUNTEST_ARGS": "",
    
    2347 2347
           "TEST_ENV": "x86_64-linux-deb11-validate+debug_info",
    
    ... ... @@ -2405,7 +2405,7 @@
    2405 2405
           "BIGNUM_BACKEND": "gmp",
    
    2406 2406
           "BIN_DIST_NAME": "ghc-x86_64-linux-deb12-validate",
    
    2407 2407
           "BUILD_FLAVOUR": "validate",
    
    2408
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    2408
    +      "CONFIGURE_ARGS": "",
    
    2409 2409
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    2410 2410
           "RUNTEST_ARGS": "",
    
    2411 2411
           "TEST_ENV": "x86_64-linux-deb12-validate",
    
    ... ... @@ -2469,7 +2469,7 @@
    2469 2469
           "BIGNUM_BACKEND": "gmp",
    
    2470 2470
           "BIN_DIST_NAME": "ghc-x86_64-linux-deb13-cross_aarch64-linux-gnu-validate",
    
    2471 2471
           "BUILD_FLAVOUR": "validate",
    
    2472
    -      "CONFIGURE_ARGS": "--with-intree-gmp --enable-strict-ghc-toolchain-check",
    
    2472
    +      "CONFIGURE_ARGS": "--with-intree-gmp",
    
    2473 2473
           "CROSS_EMULATOR": "qemu-aarch64 -L /usr/aarch64-linux-gnu",
    
    2474 2474
           "CROSS_STAGE": "2",
    
    2475 2475
           "CROSS_TARGET": "aarch64-linux-gnu",
    
    ... ... @@ -2536,7 +2536,7 @@
    2536 2536
           "BIGNUM_BACKEND": "native",
    
    2537 2537
           "BIN_DIST_NAME": "ghc-x86_64-linux-deb13-int_native-validate",
    
    2538 2538
           "BUILD_FLAVOUR": "validate",
    
    2539
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    2539
    +      "CONFIGURE_ARGS": "",
    
    2540 2540
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    2541 2541
           "RUNTEST_ARGS": "",
    
    2542 2542
           "TEST_ENV": "x86_64-linux-deb13-int_native-validate",
    
    ... ... @@ -2600,7 +2600,7 @@
    2600 2600
           "BIGNUM_BACKEND": "gmp",
    
    2601 2601
           "BIN_DIST_NAME": "ghc-x86_64-linux-deb13-no_tntc-validate",
    
    2602 2602
           "BUILD_FLAVOUR": "validate",
    
    2603
    -      "CONFIGURE_ARGS": "--disable-tables-next-to-code --enable-strict-ghc-toolchain-check",
    
    2603
    +      "CONFIGURE_ARGS": "--disable-tables-next-to-code",
    
    2604 2604
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    2605 2605
           "RUNTEST_ARGS": "",
    
    2606 2606
           "TEST_ENV": "x86_64-linux-deb13-no_tntc-validate",
    
    ... ... @@ -2664,7 +2664,7 @@
    2664 2664
           "BIGNUM_BACKEND": "gmp",
    
    2665 2665
           "BIN_DIST_NAME": "ghc-x86_64-linux-deb13-numa-slow-validate",
    
    2666 2666
           "BUILD_FLAVOUR": "slow-validate",
    
    2667
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    2667
    +      "CONFIGURE_ARGS": "",
    
    2668 2668
           "ENABLE_NUMA": "1",
    
    2669 2669
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    2670 2670
           "RUNTEST_ARGS": "",
    
    ... ... @@ -2729,7 +2729,7 @@
    2729 2729
           "BIGNUM_BACKEND": "gmp",
    
    2730 2730
           "BIN_DIST_NAME": "ghc-x86_64-linux-deb13-release",
    
    2731 2731
           "BUILD_FLAVOUR": "release",
    
    2732
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    2732
    +      "CONFIGURE_ARGS": "",
    
    2733 2733
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    2734 2734
           "RUNTEST_ARGS": " --config perf_path=perf",
    
    2735 2735
           "TEST_ENV": "x86_64-linux-deb13-release",
    
    ... ... @@ -2793,7 +2793,7 @@
    2793 2793
           "BIGNUM_BACKEND": "gmp",
    
    2794 2794
           "BIN_DIST_NAME": "ghc-x86_64-linux-deb13-riscv-cross_riscv64-linux-gnu-validate",
    
    2795 2795
           "BUILD_FLAVOUR": "validate",
    
    2796
    -      "CONFIGURE_ARGS": "--with-intree-gmp --enable-strict-ghc-toolchain-check",
    
    2796
    +      "CONFIGURE_ARGS": "--with-intree-gmp",
    
    2797 2797
           "CROSS_EMULATOR": "qemu-riscv64 -L /usr/riscv64-linux-gnu",
    
    2798 2798
           "CROSS_STAGE": "2",
    
    2799 2799
           "CROSS_TARGET": "riscv64-linux-gnu",
    
    ... ... @@ -2860,7 +2860,7 @@
    2860 2860
           "BIGNUM_BACKEND": "gmp",
    
    2861 2861
           "BIN_DIST_NAME": "ghc-x86_64-linux-deb13-unreg-validate",
    
    2862 2862
           "BUILD_FLAVOUR": "validate",
    
    2863
    -      "CONFIGURE_ARGS": "--enable-unregisterised --enable-strict-ghc-toolchain-check",
    
    2863
    +      "CONFIGURE_ARGS": "--enable-unregisterised",
    
    2864 2864
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    2865 2865
           "RUNTEST_ARGS": "",
    
    2866 2866
           "TEST_ENV": "x86_64-linux-deb13-unreg-validate",
    
    ... ... @@ -2924,7 +2924,7 @@
    2924 2924
           "BIGNUM_BACKEND": "gmp",
    
    2925 2925
           "BIN_DIST_NAME": "ghc-x86_64-linux-deb13-validate",
    
    2926 2926
           "BUILD_FLAVOUR": "validate",
    
    2927
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    2927
    +      "CONFIGURE_ARGS": "",
    
    2928 2928
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    2929 2929
           "RUNTEST_ARGS": "",
    
    2930 2930
           "TEST_ENV": "x86_64-linux-deb13-validate",
    
    ... ... @@ -2988,7 +2988,7 @@
    2988 2988
           "BIGNUM_BACKEND": "gmp",
    
    2989 2989
           "BIN_DIST_NAME": "ghc-x86_64-linux-deb13-validate+boot_nonmoving_gc",
    
    2990 2990
           "BUILD_FLAVOUR": "validate+boot_nonmoving_gc",
    
    2991
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    2991
    +      "CONFIGURE_ARGS": "",
    
    2992 2992
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    2993 2993
           "RUNTEST_ARGS": "--way=nonmoving --way=nonmoving_thr --way=nonmoving_thr_sanity",
    
    2994 2994
           "TEST_ENV": "x86_64-linux-deb13-validate+boot_nonmoving_gc",
    
    ... ... @@ -3052,7 +3052,7 @@
    3052 3052
           "BIGNUM_BACKEND": "gmp",
    
    3053 3053
           "BIN_DIST_NAME": "ghc-x86_64-linux-deb13-validate+llvm",
    
    3054 3054
           "BUILD_FLAVOUR": "validate+llvm",
    
    3055
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    3055
    +      "CONFIGURE_ARGS": "",
    
    3056 3056
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    3057 3057
           "RUNTEST_ARGS": "",
    
    3058 3058
           "TEST_ENV": "x86_64-linux-deb13-validate+llvm",
    
    ... ... @@ -3116,7 +3116,7 @@
    3116 3116
           "BIGNUM_BACKEND": "gmp",
    
    3117 3117
           "BIN_DIST_NAME": "ghc-x86_64-linux-deb13-validate+thread_sanitizer_cmm",
    
    3118 3118
           "BUILD_FLAVOUR": "validate+thread_sanitizer_cmm",
    
    3119
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    3119
    +      "CONFIGURE_ARGS": "",
    
    3120 3120
           "HADRIAN_ARGS": "--docs=none",
    
    3121 3121
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    3122 3122
           "RUNTEST_ARGS": "",
    
    ... ... @@ -3182,7 +3182,7 @@
    3182 3182
           "BIGNUM_BACKEND": "gmp",
    
    3183 3183
           "BIN_DIST_NAME": "ghc-x86_64-linux-deb13-zstd-validate",
    
    3184 3184
           "BUILD_FLAVOUR": "validate",
    
    3185
    -      "CONFIGURE_ARGS": "--enable-ipe-data-compression --enable-strict-ghc-toolchain-check",
    
    3185
    +      "CONFIGURE_ARGS": "--enable-ipe-data-compression",
    
    3186 3186
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    3187 3187
           "RUNTEST_ARGS": "",
    
    3188 3188
           "TEST_ENV": "x86_64-linux-deb13-zstd-validate",
    
    ... ... @@ -3246,7 +3246,7 @@
    3246 3246
           "BIGNUM_BACKEND": "gmp",
    
    3247 3247
           "BIN_DIST_NAME": "ghc-x86_64-linux-fedora43-release",
    
    3248 3248
           "BUILD_FLAVOUR": "release",
    
    3249
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    3249
    +      "CONFIGURE_ARGS": "",
    
    3250 3250
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    3251 3251
           "RUNTEST_ARGS": "",
    
    3252 3252
           "TEST_ENV": "x86_64-linux-fedora43-release",
    
    ... ... @@ -3310,7 +3310,7 @@
    3310 3310
           "BIGNUM_BACKEND": "gmp",
    
    3311 3311
           "BIN_DIST_NAME": "ghc-x86_64-linux-fedora43-release",
    
    3312 3312
           "BUILD_FLAVOUR": "release",
    
    3313
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    3313
    +      "CONFIGURE_ARGS": "",
    
    3314 3314
           "HADRIAN_ARGS": "--haddock-for-hackage",
    
    3315 3315
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    3316 3316
           "RUNTEST_ARGS": "",
    
    ... ... @@ -3375,7 +3375,7 @@
    3375 3375
           "BIGNUM_BACKEND": "gmp",
    
    3376 3376
           "BIN_DIST_NAME": "ghc-x86_64-linux-fedora43-validate",
    
    3377 3377
           "BUILD_FLAVOUR": "validate",
    
    3378
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    3378
    +      "CONFIGURE_ARGS": "",
    
    3379 3379
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    3380 3380
           "RUNTEST_ARGS": "",
    
    3381 3381
           "TEST_ENV": "x86_64-linux-fedora43-validate",
    
    ... ... @@ -3439,7 +3439,7 @@
    3439 3439
           "BIGNUM_BACKEND": "gmp",
    
    3440 3440
           "BIN_DIST_NAME": "ghc-x86_64-linux-fedora43-validate+debug_info",
    
    3441 3441
           "BUILD_FLAVOUR": "validate+debug_info",
    
    3442
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    3442
    +      "CONFIGURE_ARGS": "",
    
    3443 3443
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    3444 3444
           "RUNTEST_ARGS": "",
    
    3445 3445
           "TEST_ENV": "x86_64-linux-fedora43-validate+debug_info",
    
    ... ... @@ -3503,7 +3503,7 @@
    3503 3503
           "BIGNUM_BACKEND": "gmp",
    
    3504 3504
           "BIN_DIST_NAME": "ghc-x86_64-linux-fedora43-validate+debug_info+ubsan",
    
    3505 3505
           "BUILD_FLAVOUR": "validate+debug_info+ubsan",
    
    3506
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    3506
    +      "CONFIGURE_ARGS": "",
    
    3507 3507
           "HADRIAN_ARGS": "--docs=none",
    
    3508 3508
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    3509 3509
           "RUNTEST_ARGS": "",
    
    ... ... @@ -3569,7 +3569,7 @@
    3569 3569
           "BIGNUM_BACKEND": "gmp",
    
    3570 3570
           "BIN_DIST_NAME": "ghc-x86_64-linux-rocky8-validate",
    
    3571 3571
           "BUILD_FLAVOUR": "validate",
    
    3572
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    3572
    +      "CONFIGURE_ARGS": "",
    
    3573 3573
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    3574 3574
           "RUNTEST_ARGS": "",
    
    3575 3575
           "TEST_ENV": "x86_64-linux-rocky8-validate",
    
    ... ... @@ -3633,7 +3633,7 @@
    3633 3633
           "BIGNUM_BACKEND": "gmp",
    
    3634 3634
           "BIN_DIST_NAME": "ghc-x86_64-linux-ubuntu22_04-validate",
    
    3635 3635
           "BUILD_FLAVOUR": "validate",
    
    3636
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    3636
    +      "CONFIGURE_ARGS": "",
    
    3637 3637
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    3638 3638
           "RUNTEST_ARGS": "",
    
    3639 3639
           "TEST_ENV": "x86_64-linux-ubuntu22_04-validate",
    
    ... ... @@ -3697,7 +3697,7 @@
    3697 3697
           "BIGNUM_BACKEND": "gmp",
    
    3698 3698
           "BIN_DIST_NAME": "ghc-x86_64-linux-ubuntu24_04-loongarch-cross_loongarch64-linux-gnu-validate",
    
    3699 3699
           "BUILD_FLAVOUR": "validate",
    
    3700
    -      "CONFIGURE_ARGS": "--with-intree-gmp --enable-strict-ghc-toolchain-check",
    
    3700
    +      "CONFIGURE_ARGS": "--with-intree-gmp",
    
    3701 3701
           "CROSS_EMULATOR": "qemu-loongarch64 -L /usr/loongarch64-linux-gnu",
    
    3702 3702
           "CROSS_STAGE": "2",
    
    3703 3703
           "CROSS_TARGET": "loongarch64-linux-gnu",
    
    ... ... @@ -3764,7 +3764,7 @@
    3764 3764
           "BIGNUM_BACKEND": "gmp",
    
    3765 3765
           "BIN_DIST_NAME": "ghc-x86_64-linux-ubuntu24_04-validate",
    
    3766 3766
           "BUILD_FLAVOUR": "validate",
    
    3767
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    3767
    +      "CONFIGURE_ARGS": "",
    
    3768 3768
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    3769 3769
           "RUNTEST_ARGS": "",
    
    3770 3770
           "TEST_ENV": "x86_64-linux-ubuntu24_04-validate",
    
    ... ... @@ -3824,7 +3824,7 @@
    3824 3824
           "BIN_DIST_NAME": "ghc-x86_64-windows-int_native-validate",
    
    3825 3825
           "BUILD_FLAVOUR": "validate",
    
    3826 3826
           "CABAL_INSTALL_VERSION": "3.14.2.0",
    
    3827
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    3827
    +      "CONFIGURE_ARGS": "",
    
    3828 3828
           "FETCH_GHC_VERSION": "9.10.3",
    
    3829 3829
           "HADRIAN_ARGS": "--docs=no-sphinx-pdfs",
    
    3830 3830
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    ... ... @@ -3888,7 +3888,7 @@
    3888 3888
           "BIN_DIST_NAME": "ghc-x86_64-windows-validate",
    
    3889 3889
           "BUILD_FLAVOUR": "validate",
    
    3890 3890
           "CABAL_INSTALL_VERSION": "3.14.2.0",
    
    3891
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    3891
    +      "CONFIGURE_ARGS": "",
    
    3892 3892
           "FETCH_GHC_VERSION": "9.10.3",
    
    3893 3893
           "HADRIAN_ARGS": "--docs=no-sphinx-pdfs",
    
    3894 3894
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    ... ... @@ -3956,7 +3956,7 @@
    3956 3956
           "BIGNUM_BACKEND": "gmp",
    
    3957 3957
           "BIN_DIST_NAME": "ghc-aarch64-darwin-release",
    
    3958 3958
           "BUILD_FLAVOUR": "release",
    
    3959
    -      "CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check",
    
    3959
    +      "CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi ",
    
    3960 3960
           "HADRIAN_ARGS": "--docs=no-sphinx-pdfs",
    
    3961 3961
           "IGNORE_PERF_FAILURES": "all",
    
    3962 3962
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    ... ... @@ -4026,7 +4026,7 @@
    4026 4026
           "BIN_DIST_NAME": "ghc-aarch64-linux-alpine3_23-release+no_split_sections",
    
    4027 4027
           "BROKEN_TESTS": "encoding004 T10458",
    
    4028 4028
           "BUILD_FLAVOUR": "release+no_split_sections",
    
    4029
    -      "CONFIGURE_ARGS": "--disable-ld-override --enable-ignore-build-platform-mismatch --build=aarch64-unknown-linux --host=aarch64-unknown-linux --target=aarch64-unknown-linux --enable-strict-ghc-toolchain-check",
    
    4029
    +      "CONFIGURE_ARGS": "--disable-ld-override --enable-ignore-build-platform-mismatch --build=aarch64-unknown-linux --host=aarch64-unknown-linux --target=aarch64-unknown-linux ",
    
    4030 4030
           "IGNORE_PERF_FAILURES": "all",
    
    4031 4031
           "INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
    
    4032 4032
           "RUNTEST_ARGS": "",
    
    ... ... @@ -4091,7 +4091,7 @@
    4091 4091
           "BIGNUM_BACKEND": "gmp",
    
    4092 4092
           "BIN_DIST_NAME": "ghc-aarch64-linux-deb11-release+no_split_sections",
    
    4093 4093
           "BUILD_FLAVOUR": "release+no_split_sections",
    
    4094
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    4094
    +      "CONFIGURE_ARGS": "",
    
    4095 4095
           "IGNORE_PERF_FAILURES": "all",
    
    4096 4096
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    4097 4097
           "RUNTEST_ARGS": "",
    
    ... ... @@ -4156,7 +4156,7 @@
    4156 4156
           "BIGNUM_BACKEND": "gmp",
    
    4157 4157
           "BIN_DIST_NAME": "ghc-aarch64-linux-deb12-release+no_split_sections",
    
    4158 4158
           "BUILD_FLAVOUR": "release+no_split_sections",
    
    4159
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    4159
    +      "CONFIGURE_ARGS": "",
    
    4160 4160
           "IGNORE_PERF_FAILURES": "all",
    
    4161 4161
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    4162 4162
           "RUNTEST_ARGS": "",
    
    ... ... @@ -4221,7 +4221,7 @@
    4221 4221
           "BIGNUM_BACKEND": "gmp",
    
    4222 4222
           "BIN_DIST_NAME": "ghc-aarch64-linux-deb13-release+no_split_sections",
    
    4223 4223
           "BUILD_FLAVOUR": "release+no_split_sections",
    
    4224
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    4224
    +      "CONFIGURE_ARGS": "",
    
    4225 4225
           "IGNORE_PERF_FAILURES": "all",
    
    4226 4226
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    4227 4227
           "RUNTEST_ARGS": "",
    
    ... ... @@ -4287,7 +4287,7 @@
    4287 4287
           "BIN_DIST_NAME": "ghc-i386-linux-alpine3_23-release+no_split_sections",
    
    4288 4288
           "BROKEN_TESTS": "encoding004 T10458 simd009 T25169",
    
    4289 4289
           "BUILD_FLAVOUR": "release+no_split_sections",
    
    4290
    -      "CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
    
    4290
    +      "CONFIGURE_ARGS": "--disable-ld-override ",
    
    4291 4291
           "IGNORE_PERF_FAILURES": "all",
    
    4292 4292
           "INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
    
    4293 4293
           "RUNTEST_ARGS": "",
    
    ... ... @@ -4352,7 +4352,7 @@
    4352 4352
           "BIGNUM_BACKEND": "gmp",
    
    4353 4353
           "BIN_DIST_NAME": "ghc-i386-linux-deb11-release+no_split_sections",
    
    4354 4354
           "BUILD_FLAVOUR": "release+no_split_sections",
    
    4355
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    4355
    +      "CONFIGURE_ARGS": "",
    
    4356 4356
           "IGNORE_PERF_FAILURES": "all",
    
    4357 4357
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    4358 4358
           "RUNTEST_ARGS": "",
    
    ... ... @@ -4417,7 +4417,7 @@
    4417 4417
           "BIGNUM_BACKEND": "gmp",
    
    4418 4418
           "BIN_DIST_NAME": "ghc-i386-linux-deb12-release+no_split_sections",
    
    4419 4419
           "BUILD_FLAVOUR": "release+no_split_sections",
    
    4420
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    4420
    +      "CONFIGURE_ARGS": "",
    
    4421 4421
           "IGNORE_PERF_FAILURES": "all",
    
    4422 4422
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    4423 4423
           "RUNTEST_ARGS": "",
    
    ... ... @@ -4482,7 +4482,7 @@
    4482 4482
           "BIGNUM_BACKEND": "gmp",
    
    4483 4483
           "BIN_DIST_NAME": "ghc-i386-linux-deb13-release+no_split_sections",
    
    4484 4484
           "BUILD_FLAVOUR": "release+no_split_sections",
    
    4485
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    4485
    +      "CONFIGURE_ARGS": "",
    
    4486 4486
           "IGNORE_PERF_FAILURES": "all",
    
    4487 4487
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    4488 4488
           "RUNTEST_ARGS": "",
    
    ... ... @@ -4547,7 +4547,7 @@
    4547 4547
           "BIGNUM_BACKEND": "gmp",
    
    4548 4548
           "BIN_DIST_NAME": "ghc-x86_64-darwin-release",
    
    4549 4549
           "BUILD_FLAVOUR": "release",
    
    4550
    -      "CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check",
    
    4550
    +      "CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi ",
    
    4551 4551
           "HADRIAN_ARGS": "--docs=no-sphinx-pdfs",
    
    4552 4552
           "IGNORE_PERF_FAILURES": "all",
    
    4553 4553
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    ... ... @@ -4620,7 +4620,7 @@
    4620 4620
           "BUILD_FLAVOUR": "release+no_split_sections",
    
    4621 4621
           "CABAL_INSTALL_VERSION": "3.14.2.0",
    
    4622 4622
           "CC": "cc",
    
    4623
    -      "CONFIGURE_ARGS": "--with-iconv-includes=/usr/local/include --with-iconv-libraries=/usr/local/lib --with-system-libffi --with-ffi-includes=/usr/local/include --with-ffi-libraries=/usr/local/lib --with-gmp-includes=/usr/local/include --with-gmp-libraries=/usr/local/lib --enable-strict-ghc-toolchain-check",
    
    4623
    +      "CONFIGURE_ARGS": "--with-iconv-includes=/usr/local/include --with-iconv-libraries=/usr/local/lib --with-system-libffi --with-ffi-includes=/usr/local/include --with-ffi-libraries=/usr/local/lib --with-gmp-includes=/usr/local/include --with-gmp-libraries=/usr/local/lib ",
    
    4624 4624
           "CXX": "c++",
    
    4625 4625
           "FETCH_GHC_VERSION": "9.10.3",
    
    4626 4626
           "IGNORE_PERF_FAILURES": "all",
    
    ... ... @@ -4688,7 +4688,7 @@
    4688 4688
           "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_12-int_native-release+fully_static",
    
    4689 4689
           "BROKEN_TESTS": "ghcilink002 linker_unload_native encoding004 T10458",
    
    4690 4690
           "BUILD_FLAVOUR": "release+fully_static",
    
    4691
    -      "CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
    
    4691
    +      "CONFIGURE_ARGS": "--disable-ld-override ",
    
    4692 4692
           "IGNORE_PERF_FAILURES": "all",
    
    4693 4693
           "INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
    
    4694 4694
           "RUNTEST_ARGS": "",
    
    ... ... @@ -4754,7 +4754,7 @@
    4754 4754
           "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_12-release+fully_static+no_split_sections",
    
    4755 4755
           "BROKEN_TESTS": "ghcilink002 linker_unload_native encoding004 T10458",
    
    4756 4756
           "BUILD_FLAVOUR": "release+fully_static+no_split_sections",
    
    4757
    -      "CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
    
    4757
    +      "CONFIGURE_ARGS": "--disable-ld-override ",
    
    4758 4758
           "IGNORE_PERF_FAILURES": "all",
    
    4759 4759
           "INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
    
    4760 4760
           "RUNTEST_ARGS": "",
    
    ... ... @@ -4820,7 +4820,7 @@
    4820 4820
           "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_23-release+no_split_sections",
    
    4821 4821
           "BROKEN_TESTS": "encoding004 T10458",
    
    4822 4822
           "BUILD_FLAVOUR": "release+no_split_sections",
    
    4823
    -      "CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
    
    4823
    +      "CONFIGURE_ARGS": "--disable-ld-override ",
    
    4824 4824
           "IGNORE_PERF_FAILURES": "all",
    
    4825 4825
           "INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
    
    4826 4826
           "RUNTEST_ARGS": "",
    
    ... ... @@ -4885,7 +4885,7 @@
    4885 4885
           "BIGNUM_BACKEND": "gmp",
    
    4886 4886
           "BIN_DIST_NAME": "ghc-x86_64-linux-deb11-release",
    
    4887 4887
           "BUILD_FLAVOUR": "release",
    
    4888
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    4888
    +      "CONFIGURE_ARGS": "",
    
    4889 4889
           "IGNORE_PERF_FAILURES": "all",
    
    4890 4890
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    4891 4891
           "RUNTEST_ARGS": "",
    
    ... ... @@ -4950,7 +4950,7 @@
    4950 4950
           "BIGNUM_BACKEND": "gmp",
    
    4951 4951
           "BIN_DIST_NAME": "ghc-x86_64-linux-deb11-release+debug_info",
    
    4952 4952
           "BUILD_FLAVOUR": "release+debug_info",
    
    4953
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    4953
    +      "CONFIGURE_ARGS": "",
    
    4954 4954
           "IGNORE_PERF_FAILURES": "all",
    
    4955 4955
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    4956 4956
           "RUNTEST_ARGS": "",
    
    ... ... @@ -5015,7 +5015,7 @@
    5015 5015
           "BIGNUM_BACKEND": "gmp",
    
    5016 5016
           "BIN_DIST_NAME": "ghc-x86_64-linux-deb12-release",
    
    5017 5017
           "BUILD_FLAVOUR": "release",
    
    5018
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    5018
    +      "CONFIGURE_ARGS": "",
    
    5019 5019
           "IGNORE_PERF_FAILURES": "all",
    
    5020 5020
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    5021 5021
           "RUNTEST_ARGS": "",
    
    ... ... @@ -5080,7 +5080,7 @@
    5080 5080
           "BIGNUM_BACKEND": "gmp",
    
    5081 5081
           "BIN_DIST_NAME": "ghc-x86_64-linux-deb13-release",
    
    5082 5082
           "BUILD_FLAVOUR": "release",
    
    5083
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    5083
    +      "CONFIGURE_ARGS": "",
    
    5084 5084
           "IGNORE_PERF_FAILURES": "all",
    
    5085 5085
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    5086 5086
           "RUNTEST_ARGS": "",
    
    ... ... @@ -5145,7 +5145,7 @@
    5145 5145
           "BIGNUM_BACKEND": "gmp",
    
    5146 5146
           "BIN_DIST_NAME": "ghc-x86_64-linux-fedora43-release",
    
    5147 5147
           "BUILD_FLAVOUR": "release",
    
    5148
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    5148
    +      "CONFIGURE_ARGS": "",
    
    5149 5149
           "IGNORE_PERF_FAILURES": "all",
    
    5150 5150
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    5151 5151
           "RUNTEST_ARGS": "",
    
    ... ... @@ -5210,7 +5210,7 @@
    5210 5210
           "BIGNUM_BACKEND": "gmp",
    
    5211 5211
           "BIN_DIST_NAME": "ghc-x86_64-linux-fedora43-release+debug_info",
    
    5212 5212
           "BUILD_FLAVOUR": "release+debug_info",
    
    5213
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    5213
    +      "CONFIGURE_ARGS": "",
    
    5214 5214
           "IGNORE_PERF_FAILURES": "all",
    
    5215 5215
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    5216 5216
           "RUNTEST_ARGS": "",
    
    ... ... @@ -5275,7 +5275,7 @@
    5275 5275
           "BIGNUM_BACKEND": "gmp",
    
    5276 5276
           "BIN_DIST_NAME": "ghc-x86_64-linux-fedora43-release",
    
    5277 5277
           "BUILD_FLAVOUR": "release",
    
    5278
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    5278
    +      "CONFIGURE_ARGS": "",
    
    5279 5279
           "HADRIAN_ARGS": "--haddock-for-hackage",
    
    5280 5280
           "IGNORE_PERF_FAILURES": "all",
    
    5281 5281
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    ... ... @@ -5341,7 +5341,7 @@
    5341 5341
           "BIGNUM_BACKEND": "gmp",
    
    5342 5342
           "BIN_DIST_NAME": "ghc-x86_64-linux-rocky8-release",
    
    5343 5343
           "BUILD_FLAVOUR": "release",
    
    5344
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    5344
    +      "CONFIGURE_ARGS": "",
    
    5345 5345
           "IGNORE_PERF_FAILURES": "all",
    
    5346 5346
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    5347 5347
           "RUNTEST_ARGS": "",
    
    ... ... @@ -5406,7 +5406,7 @@
    5406 5406
           "BIGNUM_BACKEND": "gmp",
    
    5407 5407
           "BIN_DIST_NAME": "ghc-x86_64-linux-ubuntu22_04-release",
    
    5408 5408
           "BUILD_FLAVOUR": "release",
    
    5409
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    5409
    +      "CONFIGURE_ARGS": "",
    
    5410 5410
           "IGNORE_PERF_FAILURES": "all",
    
    5411 5411
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    5412 5412
           "RUNTEST_ARGS": "",
    
    ... ... @@ -5471,7 +5471,7 @@
    5471 5471
           "BIGNUM_BACKEND": "gmp",
    
    5472 5472
           "BIN_DIST_NAME": "ghc-x86_64-linux-ubuntu24_04-release",
    
    5473 5473
           "BUILD_FLAVOUR": "release",
    
    5474
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    5474
    +      "CONFIGURE_ARGS": "",
    
    5475 5475
           "IGNORE_PERF_FAILURES": "all",
    
    5476 5476
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    5477 5477
           "RUNTEST_ARGS": "",
    
    ... ... @@ -5532,7 +5532,7 @@
    5532 5532
           "BIN_DIST_NAME": "ghc-x86_64-windows-int_native-release",
    
    5533 5533
           "BUILD_FLAVOUR": "release",
    
    5534 5534
           "CABAL_INSTALL_VERSION": "3.14.2.0",
    
    5535
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    5535
    +      "CONFIGURE_ARGS": "",
    
    5536 5536
           "FETCH_GHC_VERSION": "9.10.3",
    
    5537 5537
           "HADRIAN_ARGS": "--docs=no-sphinx-pdfs",
    
    5538 5538
           "IGNORE_PERF_FAILURES": "all",
    
    ... ... @@ -5597,7 +5597,7 @@
    5597 5597
           "BIN_DIST_NAME": "ghc-x86_64-windows-release",
    
    5598 5598
           "BUILD_FLAVOUR": "release",
    
    5599 5599
           "CABAL_INSTALL_VERSION": "3.14.2.0",
    
    5600
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    5600
    +      "CONFIGURE_ARGS": "",
    
    5601 5601
           "FETCH_GHC_VERSION": "9.10.3",
    
    5602 5602
           "HADRIAN_ARGS": "--docs=no-sphinx-pdfs",
    
    5603 5603
           "IGNORE_PERF_FAILURES": "all",
    
    ... ... @@ -5666,7 +5666,7 @@
    5666 5666
           "BIGNUM_BACKEND": "gmp",
    
    5667 5667
           "BIN_DIST_NAME": "ghc-x86_64-darwin-validate",
    
    5668 5668
           "BUILD_FLAVOUR": "validate",
    
    5669
    -      "CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check",
    
    5669
    +      "CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi ",
    
    5670 5670
           "HADRIAN_ARGS": "--docs=no-sphinx-pdfs",
    
    5671 5671
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    5672 5672
           "LANG": "en_US.UTF-8",
    
    ... ... @@ -5737,7 +5737,7 @@
    5737 5737
           "BUILD_FLAVOUR": "validate",
    
    5738 5738
           "CABAL_INSTALL_VERSION": "3.14.2.0",
    
    5739 5739
           "CC": "cc",
    
    5740
    -      "CONFIGURE_ARGS": "--with-iconv-includes=/usr/local/include --with-iconv-libraries=/usr/local/lib --with-system-libffi --with-ffi-includes=/usr/local/include --with-ffi-libraries=/usr/local/lib --with-gmp-includes=/usr/local/include --with-gmp-libraries=/usr/local/lib --enable-strict-ghc-toolchain-check",
    
    5740
    +      "CONFIGURE_ARGS": "--with-iconv-includes=/usr/local/include --with-iconv-libraries=/usr/local/lib --with-system-libffi --with-ffi-includes=/usr/local/include --with-ffi-libraries=/usr/local/lib --with-gmp-includes=/usr/local/include --with-gmp-libraries=/usr/local/lib ",
    
    5741 5741
           "CXX": "c++",
    
    5742 5742
           "FETCH_GHC_VERSION": "9.10.3",
    
    5743 5743
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    ... ... @@ -5803,7 +5803,7 @@
    5803 5803
           "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_12-int_native-validate+fully_static",
    
    5804 5804
           "BROKEN_TESTS": "ghcilink002 linker_unload_native encoding004 T10458",
    
    5805 5805
           "BUILD_FLAVOUR": "validate+fully_static",
    
    5806
    -      "CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
    
    5806
    +      "CONFIGURE_ARGS": "--disable-ld-override ",
    
    5807 5807
           "INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
    
    5808 5808
           "RUNTEST_ARGS": "",
    
    5809 5809
           "TEST_ENV": "x86_64-linux-alpine3_12-int_native-validate+fully_static",
    
    ... ... @@ -5867,7 +5867,7 @@
    5867 5867
           "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_12-validate+fully_static",
    
    5868 5868
           "BROKEN_TESTS": "ghcilink002 linker_unload_native encoding004 T10458",
    
    5869 5869
           "BUILD_FLAVOUR": "validate+fully_static",
    
    5870
    -      "CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
    
    5870
    +      "CONFIGURE_ARGS": "--disable-ld-override ",
    
    5871 5871
           "INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
    
    5872 5872
           "RUNTEST_ARGS": "",
    
    5873 5873
           "TEST_ENV": "x86_64-linux-alpine3_12-validate+fully_static",
    
    ... ... @@ -5931,7 +5931,7 @@
    5931 5931
           "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_23-validate",
    
    5932 5932
           "BROKEN_TESTS": "encoding004 T10458",
    
    5933 5933
           "BUILD_FLAVOUR": "validate",
    
    5934
    -      "CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
    
    5934
    +      "CONFIGURE_ARGS": "--disable-ld-override ",
    
    5935 5935
           "INSTALL_CONFIGURE_ARGS": "--disable-ld-override --enable-strict-ghc-toolchain-check",
    
    5936 5936
           "RUNTEST_ARGS": "",
    
    5937 5937
           "TEST_ENV": "x86_64-linux-alpine3_23-validate",
    
    ... ... @@ -5994,7 +5994,7 @@
    5994 5994
           "BIGNUM_BACKEND": "gmp",
    
    5995 5995
           "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_23-wasm-cross_wasm32-wasi-release+host_fully_static+text_simdutf",
    
    5996 5996
           "BUILD_FLAVOUR": "release+host_fully_static+text_simdutf",
    
    5997
    -      "CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check",
    
    5997
    +      "CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi",
    
    5998 5998
           "CROSS_STAGE": "2",
    
    5999 5999
           "CROSS_TARGET": "wasm32-wasi",
    
    6000 6000
           "FIREFOX_LAUNCH_OPTS": "{\"browser\":\"firefox\",\"executablePath\":\"/usr/bin/firefox\"}",
    
    ... ... @@ -6061,7 +6061,7 @@
    6061 6061
           "BIGNUM_BACKEND": "native",
    
    6062 6062
           "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_23-wasm-int_native-cross_wasm32-wasi-release+host_fully_static+text_simdutf",
    
    6063 6063
           "BUILD_FLAVOUR": "release+host_fully_static+text_simdutf",
    
    6064
    -      "CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check",
    
    6064
    +      "CONFIGURE_ARGS": "--with-intree-gmp --with-system-libffi",
    
    6065 6065
           "CROSS_STAGE": "2",
    
    6066 6066
           "CROSS_TARGET": "wasm32-wasi",
    
    6067 6067
           "FIREFOX_LAUNCH_OPTS": "{\"browser\":\"firefox\",\"executablePath\":\"/usr/bin/firefox\"}",
    
    ... ... @@ -6128,7 +6128,7 @@
    6128 6128
           "BIGNUM_BACKEND": "gmp",
    
    6129 6129
           "BIN_DIST_NAME": "ghc-x86_64-linux-alpine3_23-wasm-unreg-cross_wasm32-wasi-release+host_fully_static+text_simdutf",
    
    6130 6130
           "BUILD_FLAVOUR": "release+host_fully_static+text_simdutf",
    
    6131
    -      "CONFIGURE_ARGS": "--enable-unregisterised --with-intree-gmp --with-system-libffi --enable-strict-ghc-toolchain-check",
    
    6131
    +      "CONFIGURE_ARGS": "--enable-unregisterised --with-intree-gmp --with-system-libffi",
    
    6132 6132
           "CROSS_STAGE": "2",
    
    6133 6133
           "CROSS_TARGET": "wasm32-wasi",
    
    6134 6134
           "FIREFOX_LAUNCH_OPTS": "{\"browser\":\"firefox\",\"executablePath\":\"/usr/bin/firefox\"}",
    
    ... ... @@ -6194,7 +6194,7 @@
    6194 6194
           "BIGNUM_BACKEND": "native",
    
    6195 6195
           "BIN_DIST_NAME": "ghc-x86_64-linux-deb11-emsdk-closure-int_native-cross_javascript-unknown-ghcjs-validate",
    
    6196 6196
           "BUILD_FLAVOUR": "validate",
    
    6197
    -      "CONFIGURE_ARGS": "--with-intree-gmp --enable-strict-ghc-toolchain-check",
    
    6197
    +      "CONFIGURE_ARGS": "--with-intree-gmp",
    
    6198 6198
           "CONFIGURE_WRAPPER": "emconfigure",
    
    6199 6199
           "CROSS_STAGE": "2",
    
    6200 6200
           "CROSS_TARGET": "javascript-unknown-ghcjs",
    
    ... ... @@ -6260,7 +6260,7 @@
    6260 6260
           "BIGNUM_BACKEND": "gmp",
    
    6261 6261
           "BIN_DIST_NAME": "ghc-x86_64-linux-deb11-validate",
    
    6262 6262
           "BUILD_FLAVOUR": "validate",
    
    6263
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    6263
    +      "CONFIGURE_ARGS": "",
    
    6264 6264
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    6265 6265
           "RUNTEST_ARGS": "",
    
    6266 6266
           "TEST_ENV": "x86_64-linux-deb11-validate",
    
    ... ... @@ -6323,7 +6323,7 @@
    6323 6323
           "BIGNUM_BACKEND": "gmp",
    
    6324 6324
           "BIN_DIST_NAME": "ghc-x86_64-linux-deb11-validate+debug_info",
    
    6325 6325
           "BUILD_FLAVOUR": "validate+debug_info",
    
    6326
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    6326
    +      "CONFIGURE_ARGS": "",
    
    6327 6327
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    6328 6328
           "RUNTEST_ARGS": "",
    
    6329 6329
           "TEST_ENV": "x86_64-linux-deb11-validate+debug_info",
    
    ... ... @@ -6386,7 +6386,7 @@
    6386 6386
           "BIGNUM_BACKEND": "gmp",
    
    6387 6387
           "BIN_DIST_NAME": "ghc-x86_64-linux-deb12-validate",
    
    6388 6388
           "BUILD_FLAVOUR": "validate",
    
    6389
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    6389
    +      "CONFIGURE_ARGS": "",
    
    6390 6390
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    6391 6391
           "RUNTEST_ARGS": "",
    
    6392 6392
           "TEST_ENV": "x86_64-linux-deb12-validate",
    
    ... ... @@ -6449,7 +6449,7 @@
    6449 6449
           "BIGNUM_BACKEND": "gmp",
    
    6450 6450
           "BIN_DIST_NAME": "ghc-x86_64-linux-deb13-cross_aarch64-linux-gnu-validate",
    
    6451 6451
           "BUILD_FLAVOUR": "validate",
    
    6452
    -      "CONFIGURE_ARGS": "--with-intree-gmp --enable-strict-ghc-toolchain-check",
    
    6452
    +      "CONFIGURE_ARGS": "--with-intree-gmp",
    
    6453 6453
           "CROSS_EMULATOR": "qemu-aarch64 -L /usr/aarch64-linux-gnu",
    
    6454 6454
           "CROSS_STAGE": "2",
    
    6455 6455
           "CROSS_TARGET": "aarch64-linux-gnu",
    
    ... ... @@ -6515,7 +6515,7 @@
    6515 6515
           "BIGNUM_BACKEND": "native",
    
    6516 6516
           "BIN_DIST_NAME": "ghc-x86_64-linux-deb13-int_native-validate",
    
    6517 6517
           "BUILD_FLAVOUR": "validate",
    
    6518
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    6518
    +      "CONFIGURE_ARGS": "",
    
    6519 6519
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    6520 6520
           "RUNTEST_ARGS": "",
    
    6521 6521
           "TEST_ENV": "x86_64-linux-deb13-int_native-validate",
    
    ... ... @@ -6579,7 +6579,7 @@
    6579 6579
           "BIGNUM_BACKEND": "gmp",
    
    6580 6580
           "BIN_DIST_NAME": "ghc-x86_64-linux-deb13-no_tntc-validate",
    
    6581 6581
           "BUILD_FLAVOUR": "validate",
    
    6582
    -      "CONFIGURE_ARGS": "--disable-tables-next-to-code --enable-strict-ghc-toolchain-check",
    
    6582
    +      "CONFIGURE_ARGS": "--disable-tables-next-to-code",
    
    6583 6583
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    6584 6584
           "RUNTEST_ARGS": "",
    
    6585 6585
           "TEST_ENV": "x86_64-linux-deb13-no_tntc-validate",
    
    ... ... @@ -6642,7 +6642,7 @@
    6642 6642
           "BIGNUM_BACKEND": "gmp",
    
    6643 6643
           "BIN_DIST_NAME": "ghc-x86_64-linux-deb13-numa-slow-validate",
    
    6644 6644
           "BUILD_FLAVOUR": "slow-validate",
    
    6645
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    6645
    +      "CONFIGURE_ARGS": "",
    
    6646 6646
           "ENABLE_NUMA": "1",
    
    6647 6647
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    6648 6648
           "RUNTEST_ARGS": "",
    
    ... ... @@ -6706,7 +6706,7 @@
    6706 6706
           "BIGNUM_BACKEND": "gmp",
    
    6707 6707
           "BIN_DIST_NAME": "ghc-x86_64-linux-deb13-release",
    
    6708 6708
           "BUILD_FLAVOUR": "release",
    
    6709
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    6709
    +      "CONFIGURE_ARGS": "",
    
    6710 6710
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    6711 6711
           "RUNTEST_ARGS": " --config perf_path=perf",
    
    6712 6712
           "TEST_ENV": "x86_64-linux-deb13-release",
    
    ... ... @@ -6769,7 +6769,7 @@
    6769 6769
           "BIGNUM_BACKEND": "gmp",
    
    6770 6770
           "BIN_DIST_NAME": "ghc-x86_64-linux-deb13-riscv-cross_riscv64-linux-gnu-validate",
    
    6771 6771
           "BUILD_FLAVOUR": "validate",
    
    6772
    -      "CONFIGURE_ARGS": "--with-intree-gmp --enable-strict-ghc-toolchain-check",
    
    6772
    +      "CONFIGURE_ARGS": "--with-intree-gmp",
    
    6773 6773
           "CROSS_EMULATOR": "qemu-riscv64 -L /usr/riscv64-linux-gnu",
    
    6774 6774
           "CROSS_STAGE": "2",
    
    6775 6775
           "CROSS_TARGET": "riscv64-linux-gnu",
    
    ... ... @@ -6835,7 +6835,7 @@
    6835 6835
           "BIGNUM_BACKEND": "gmp",
    
    6836 6836
           "BIN_DIST_NAME": "ghc-x86_64-linux-deb13-unreg-validate",
    
    6837 6837
           "BUILD_FLAVOUR": "validate",
    
    6838
    -      "CONFIGURE_ARGS": "--enable-unregisterised --enable-strict-ghc-toolchain-check",
    
    6838
    +      "CONFIGURE_ARGS": "--enable-unregisterised",
    
    6839 6839
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    6840 6840
           "RUNTEST_ARGS": "",
    
    6841 6841
           "TEST_ENV": "x86_64-linux-deb13-unreg-validate",
    
    ... ... @@ -6898,7 +6898,7 @@
    6898 6898
           "BIGNUM_BACKEND": "gmp",
    
    6899 6899
           "BIN_DIST_NAME": "ghc-x86_64-linux-deb13-validate",
    
    6900 6900
           "BUILD_FLAVOUR": "validate",
    
    6901
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    6901
    +      "CONFIGURE_ARGS": "",
    
    6902 6902
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    6903 6903
           "RUNTEST_ARGS": "",
    
    6904 6904
           "TEST_ENV": "x86_64-linux-deb13-validate",
    
    ... ... @@ -6961,7 +6961,7 @@
    6961 6961
           "BIGNUM_BACKEND": "gmp",
    
    6962 6962
           "BIN_DIST_NAME": "ghc-x86_64-linux-deb13-validate+boot_nonmoving_gc",
    
    6963 6963
           "BUILD_FLAVOUR": "validate+boot_nonmoving_gc",
    
    6964
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    6964
    +      "CONFIGURE_ARGS": "",
    
    6965 6965
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    6966 6966
           "RUNTEST_ARGS": "--way=nonmoving --way=nonmoving_thr --way=nonmoving_thr_sanity",
    
    6967 6967
           "TEST_ENV": "x86_64-linux-deb13-validate+boot_nonmoving_gc",
    
    ... ... @@ -7024,7 +7024,7 @@
    7024 7024
           "BIGNUM_BACKEND": "gmp",
    
    7025 7025
           "BIN_DIST_NAME": "ghc-x86_64-linux-deb13-validate+llvm",
    
    7026 7026
           "BUILD_FLAVOUR": "validate+llvm",
    
    7027
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    7027
    +      "CONFIGURE_ARGS": "",
    
    7028 7028
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    7029 7029
           "RUNTEST_ARGS": "",
    
    7030 7030
           "TEST_ENV": "x86_64-linux-deb13-validate+llvm",
    
    ... ... @@ -7088,7 +7088,7 @@
    7088 7088
           "BIGNUM_BACKEND": "gmp",
    
    7089 7089
           "BIN_DIST_NAME": "ghc-x86_64-linux-deb13-validate+thread_sanitizer_cmm",
    
    7090 7090
           "BUILD_FLAVOUR": "validate+thread_sanitizer_cmm",
    
    7091
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    7091
    +      "CONFIGURE_ARGS": "",
    
    7092 7092
           "HADRIAN_ARGS": "--docs=none",
    
    7093 7093
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    7094 7094
           "RUNTEST_ARGS": "",
    
    ... ... @@ -7153,7 +7153,7 @@
    7153 7153
           "BIGNUM_BACKEND": "gmp",
    
    7154 7154
           "BIN_DIST_NAME": "ghc-x86_64-linux-deb13-zstd-validate",
    
    7155 7155
           "BUILD_FLAVOUR": "validate",
    
    7156
    -      "CONFIGURE_ARGS": "--enable-ipe-data-compression --enable-strict-ghc-toolchain-check",
    
    7156
    +      "CONFIGURE_ARGS": "--enable-ipe-data-compression",
    
    7157 7157
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    7158 7158
           "RUNTEST_ARGS": "",
    
    7159 7159
           "TEST_ENV": "x86_64-linux-deb13-zstd-validate",
    
    ... ... @@ -7216,7 +7216,7 @@
    7216 7216
           "BIGNUM_BACKEND": "gmp",
    
    7217 7217
           "BIN_DIST_NAME": "ghc-x86_64-linux-fedora43-release",
    
    7218 7218
           "BUILD_FLAVOUR": "release",
    
    7219
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    7219
    +      "CONFIGURE_ARGS": "",
    
    7220 7220
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    7221 7221
           "RUNTEST_ARGS": "",
    
    7222 7222
           "TEST_ENV": "x86_64-linux-fedora43-release",
    
    ... ... @@ -7279,7 +7279,7 @@
    7279 7279
           "BIGNUM_BACKEND": "gmp",
    
    7280 7280
           "BIN_DIST_NAME": "ghc-x86_64-linux-fedora43-release",
    
    7281 7281
           "BUILD_FLAVOUR": "release",
    
    7282
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    7282
    +      "CONFIGURE_ARGS": "",
    
    7283 7283
           "HADRIAN_ARGS": "--haddock-for-hackage",
    
    7284 7284
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    7285 7285
           "RUNTEST_ARGS": "",
    
    ... ... @@ -7343,7 +7343,7 @@
    7343 7343
           "BIGNUM_BACKEND": "gmp",
    
    7344 7344
           "BIN_DIST_NAME": "ghc-x86_64-linux-fedora43-validate",
    
    7345 7345
           "BUILD_FLAVOUR": "validate",
    
    7346
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    7346
    +      "CONFIGURE_ARGS": "",
    
    7347 7347
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    7348 7348
           "RUNTEST_ARGS": "",
    
    7349 7349
           "TEST_ENV": "x86_64-linux-fedora43-validate",
    
    ... ... @@ -7406,7 +7406,7 @@
    7406 7406
           "BIGNUM_BACKEND": "gmp",
    
    7407 7407
           "BIN_DIST_NAME": "ghc-x86_64-linux-fedora43-validate+debug_info",
    
    7408 7408
           "BUILD_FLAVOUR": "validate+debug_info",
    
    7409
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    7409
    +      "CONFIGURE_ARGS": "",
    
    7410 7410
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    7411 7411
           "RUNTEST_ARGS": "",
    
    7412 7412
           "TEST_ENV": "x86_64-linux-fedora43-validate+debug_info",
    
    ... ... @@ -7469,7 +7469,7 @@
    7469 7469
           "BIGNUM_BACKEND": "gmp",
    
    7470 7470
           "BIN_DIST_NAME": "ghc-x86_64-linux-fedora43-validate+debug_info+ubsan",
    
    7471 7471
           "BUILD_FLAVOUR": "validate+debug_info+ubsan",
    
    7472
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    7472
    +      "CONFIGURE_ARGS": "",
    
    7473 7473
           "HADRIAN_ARGS": "--docs=none",
    
    7474 7474
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    7475 7475
           "RUNTEST_ARGS": "",
    
    ... ... @@ -7534,7 +7534,7 @@
    7534 7534
           "BIGNUM_BACKEND": "gmp",
    
    7535 7535
           "BIN_DIST_NAME": "ghc-x86_64-linux-rocky8-validate",
    
    7536 7536
           "BUILD_FLAVOUR": "validate",
    
    7537
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    7537
    +      "CONFIGURE_ARGS": "",
    
    7538 7538
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    7539 7539
           "RUNTEST_ARGS": "",
    
    7540 7540
           "TEST_ENV": "x86_64-linux-rocky8-validate",
    
    ... ... @@ -7597,7 +7597,7 @@
    7597 7597
           "BIGNUM_BACKEND": "gmp",
    
    7598 7598
           "BIN_DIST_NAME": "ghc-x86_64-linux-ubuntu22_04-validate",
    
    7599 7599
           "BUILD_FLAVOUR": "validate",
    
    7600
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    7600
    +      "CONFIGURE_ARGS": "",
    
    7601 7601
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    7602 7602
           "RUNTEST_ARGS": "",
    
    7603 7603
           "TEST_ENV": "x86_64-linux-ubuntu22_04-validate",
    
    ... ... @@ -7660,7 +7660,7 @@
    7660 7660
           "BIGNUM_BACKEND": "gmp",
    
    7661 7661
           "BIN_DIST_NAME": "ghc-x86_64-linux-ubuntu24_04-loongarch-cross_loongarch64-linux-gnu-validate",
    
    7662 7662
           "BUILD_FLAVOUR": "validate",
    
    7663
    -      "CONFIGURE_ARGS": "--with-intree-gmp --enable-strict-ghc-toolchain-check",
    
    7663
    +      "CONFIGURE_ARGS": "--with-intree-gmp",
    
    7664 7664
           "CROSS_EMULATOR": "qemu-loongarch64 -L /usr/loongarch64-linux-gnu",
    
    7665 7665
           "CROSS_STAGE": "2",
    
    7666 7666
           "CROSS_TARGET": "loongarch64-linux-gnu",
    
    ... ... @@ -7726,7 +7726,7 @@
    7726 7726
           "BIGNUM_BACKEND": "gmp",
    
    7727 7727
           "BIN_DIST_NAME": "ghc-x86_64-linux-ubuntu24_04-validate",
    
    7728 7728
           "BUILD_FLAVOUR": "validate",
    
    7729
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    7729
    +      "CONFIGURE_ARGS": "",
    
    7730 7730
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    7731 7731
           "RUNTEST_ARGS": "",
    
    7732 7732
           "TEST_ENV": "x86_64-linux-ubuntu24_04-validate",
    
    ... ... @@ -7785,7 +7785,7 @@
    7785 7785
           "BIN_DIST_NAME": "ghc-x86_64-windows-int_native-validate",
    
    7786 7786
           "BUILD_FLAVOUR": "validate",
    
    7787 7787
           "CABAL_INSTALL_VERSION": "3.14.2.0",
    
    7788
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    7788
    +      "CONFIGURE_ARGS": "",
    
    7789 7789
           "FETCH_GHC_VERSION": "9.10.3",
    
    7790 7790
           "HADRIAN_ARGS": "--docs=no-sphinx-pdfs",
    
    7791 7791
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    ... ... @@ -7848,7 +7848,7 @@
    7848 7848
           "BIN_DIST_NAME": "ghc-x86_64-windows-validate",
    
    7849 7849
           "BUILD_FLAVOUR": "validate",
    
    7850 7850
           "CABAL_INSTALL_VERSION": "3.14.2.0",
    
    7851
    -      "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    
    7851
    +      "CONFIGURE_ARGS": "",
    
    7852 7852
           "FETCH_GHC_VERSION": "9.10.3",
    
    7853 7853
           "HADRIAN_ARGS": "--docs=no-sphinx-pdfs",
    
    7854 7854
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",