add -no-pie to linking

Author: zlonast

Cabal/src/Distribution/Simple/GHC/Build/Link.hs

@@ -126,6 +126,7 @@ linkOrLoadComponent
                 ++ [ "-static"
                    | withFullyStaticExe lbi
                    ]
+                ++ ["no-pie"]
                 -- Pass extra `ld-options` given
                 -- through to GHC's linker.
                 ++ maybe

Cabal/src/Distribution/Simple/GHC/Internal.hs

@@ -514,18 +514,6 @@ componentJsGhcOptions verbosity lbi bi clbi odir filename =
     , ghcOptExtra = hcOptions GHC bi
     }
 
--- Since the GHС is sensitive to what is given to it, we sometimes need to
--- be able to pass options only to new versions
--- We want to be able to support C++ and C separately in older ghc
--- See example in buildExtraSources "C++ Sources" or "C Sources"
-separateGhcOptions :: Monoid a => Version -> Compiler -> a -> a
-separateGhcOptions ver comp defaultOptions =
-  case compilerCompatVersion GHC comp of
-    Just v
-      | v >= ver -> defaultOptions
-      | otherwise -> mempty
-    Nothing -> mempty
-
 componentGhcOptions
   :: VerbosityLevel
   -> LocalBuildInfo
@@ -599,11 +587,7 @@ componentGhcOptions verbosity lbi bi clbi odir =
         , -- Unsupported extensions have already been checked by configure
           ghcOptExtensions = toNubListR $ usedExtensions bi
         , ghcOptExtensionMap = Map.fromList . compilerExtensions $ (compiler lbi)
-        , ghcOptCcProgram =
-            separateGhcOptions
-              (mkVersion [9, 4])
-              (compiler lbi)
-              (maybeToFlag $ programPath <$> lookupProgram gccProgram (withPrograms lbi))
+        , ghcOptCcProgram = maybeToFlag $ programPath <$> lookupProgram gccProgram (withPrograms lbi)
         }
   where
     exe_paths =

cabal-testsuite/PackageTests/FFI/ForeignOptsPgmc/cabal.test.hs

@@ -3,7 +3,7 @@ import Test.Cabal.Prelude
 main = do
   skipIfWindows "requires a POSIX shell script as the C compiler wrapper"
   cabalTest $ do
-    skipUnlessGhcVersion ">= 9.4"
+    -- skipUnlessGhcVersion ">= 9.4"
     cwd <- fmap testCurrentDir getTestEnv
     let wrapper = cwd </> "scripts/cc-wrapper.sh"
     cabal "v2-build" ["foreign-opts-pgmc-exe"]

cabal-testsuite/PackageTests/ShowBuildInfo/Complex/single-2.out

@@ -6,7 +6,7 @@ import Test.Cabal.Prelude
 main = cabalTest $ do
   -- the With GHC-9.2+ output contains -this-unit-id
   -- the With GHC-9.4+ output contains -pgmc by default
-  skipUnlessGhcVersion ">= 9.4"
+  skipUnlessGhcVersion ">= 9.2"
   withRepo "repo" $ do
     runShowBuildInfo ["exe:Complex"]
       >> withPlan