[Git][ghc/ghc][wip/romes/drop-dllwrap] configure: Drop DllWrap command

Rodrigo Mesquita (@alt-romes) gitlab at gitlab.haskell.org
Wed Jul 12 08:18:35 UTC 2023



Rodrigo Mesquita pushed to branch wip/romes/drop-dllwrap at Glasgow Haskell Compiler / GHC


Commits:
1d452ce8 by Rodrigo Mesquita at 2023-07-12T09:18:20+01:00
configure: Drop DllWrap command

We used to configure into settings a DllWrap command for windows
builds and distributions, however, we no longer do, and dllwrap is
effectively unused.

This simplification is motivated in part by the larger
toolchain-selection project (#19877, !9263)

- - - - -


11 changed files:

- compiler/GHC/Driver/Session.hs
- compiler/GHC/Settings.hs
- compiler/GHC/Settings/IO.hs
- configure.ac
- hadrian/bindist/Makefile
- hadrian/bindist/config.mk.in
- hadrian/cfg/system.config.in
- hadrian/src/Oracles/Setting.hs
- hadrian/src/Rules/Generate.hs
- m4/fp_settings.m4
- testsuite/tests/safeHaskell/flags/Flags02.hs


Changes:

=====================================
compiler/GHC/Driver/Session.hs
=====================================
@@ -102,7 +102,6 @@ module GHC.Driver.Session (
         sPgm_a,
         sPgm_l,
         sPgm_lm,
-        sPgm_dll,
         sPgm_T,
         sPgm_windres,
         sPgm_ar,
@@ -136,7 +135,7 @@ module GHC.Driver.Session (
         versionedAppDir, versionedFilePath,
         extraGccViaCFlags, globalPackageDatabasePath,
         pgm_L, pgm_P, pgm_F, pgm_c, pgm_cxx, pgm_cpp, pgm_a, pgm_l, pgm_lm,
-        pgm_dll, pgm_T, pgm_windres, pgm_ar,
+        pgm_T, pgm_windres, pgm_ar,
         pgm_ranlib, pgm_lo, pgm_lc, pgm_i,
         opt_L, opt_P, opt_F, opt_c, opt_cxx, opt_a, opt_l, opt_lm, opt_i,
         opt_P_signature,
@@ -404,8 +403,6 @@ pgm_l                 :: DynFlags -> (String,[Option])
 pgm_l dflags = toolSettings_pgm_l $ toolSettings dflags
 pgm_lm                 :: DynFlags -> Maybe (String,[Option])
 pgm_lm dflags = toolSettings_pgm_lm $ toolSettings dflags
-pgm_dll               :: DynFlags -> (String,[Option])
-pgm_dll dflags = toolSettings_pgm_dll $ toolSettings dflags
 pgm_T                 :: DynFlags -> String
 pgm_T dflags = toolSettings_pgm_T $ toolSettings dflags
 pgm_windres           :: DynFlags -> String
@@ -1080,8 +1077,6 @@ dynamic_flags_deps = [
          }
   , make_ord_flag defFlag "pgml-supports-no-pie"
       $ noArg $ alterToolSettings $ \s -> s { toolSettings_ccSupportsNoPie = True }
-  , make_ord_flag defFlag "pgmdll"
-      $ hasArg $ \f -> alterToolSettings $ \s -> s { toolSettings_pgm_dll = (f,[]) }
   , make_ord_flag defFlag "pgmwindres"
       $ hasArg $ \f -> alterToolSettings $ \s -> s { toolSettings_pgm_windres = f }
   , make_ord_flag defFlag "pgmar"


=====================================
compiler/GHC/Settings.hs
=====================================
@@ -33,7 +33,6 @@ module GHC.Settings
   , sPgm_a
   , sPgm_l
   , sPgm_lm
-  , sPgm_dll
   , sPgm_T
   , sPgm_windres
   , sPgm_ar
@@ -108,7 +107,6 @@ data ToolSettings = ToolSettings
     -- ^ N.B. On Windows we don't have a linker which supports object
     -- merging, hence the 'Maybe'. See Note [Object merging] in
     -- "GHC.Driver.Pipeline.Execute" for details.
-  , toolSettings_pgm_dll     :: (String, [Option])
   , toolSettings_pgm_T       :: String
   , toolSettings_pgm_windres :: String
   , toolSettings_pgm_ar      :: String
@@ -218,8 +216,6 @@ sPgm_l :: Settings -> (String, [Option])
 sPgm_l = toolSettings_pgm_l . sToolSettings
 sPgm_lm :: Settings -> Maybe (String, [Option])
 sPgm_lm = toolSettings_pgm_lm . sToolSettings
-sPgm_dll :: Settings -> (String, [Option])
-sPgm_dll = toolSettings_pgm_dll . sToolSettings
 sPgm_T :: Settings -> String
 sPgm_T = toolSettings_pgm_T . sToolSettings
 sPgm_windres :: Settings -> String


=====================================
compiler/GHC/Settings/IO.hs
=====================================
@@ -127,9 +127,6 @@ initSettings top_dir = do
 
   touch_path <- getToolSetting "touch command"
 
-  mkdll_prog <- getToolSetting "dllwrap command"
-  let mkdll_args = []
-
   -- HACK, see setPgmP below. We keep 'words' here to remember to fix
   -- Config.hs one day.
 
@@ -189,7 +186,6 @@ initSettings top_dir = do
       , toolSettings_pgm_a   = (as_prog, as_args)
       , toolSettings_pgm_l   = (ld_prog, ld_args)
       , toolSettings_pgm_lm  = ld_r
-      , toolSettings_pgm_dll = (mkdll_prog,mkdll_args)
       , toolSettings_pgm_T   = touch_path
       , toolSettings_pgm_windres = windres_path
       , toolSettings_pgm_ar = ar_path


=====================================
configure.ac
=====================================
@@ -328,14 +328,12 @@ else
     AC_PATH_TOOL([AR],[ar])
     AC_PATH_TOOL([RANLIB],[ranlib])
     AC_PATH_TOOL([OBJDUMP],[objdump])
-    AC_PATH_TOOL([DllWrap],[dllwrap])
     AC_PATH_TOOL([Windres],[windres])
     AC_PATH_TOOL([Genlib],[genlib])
 
     HAVE_GENLIB=False
     if test "$HostOS" = "mingw32"; then
         AC_CHECK_TARGET_TOOL([Windres],[windres])
-        AC_CHECK_TARGET_TOOL([DllWrap],[dllwrap])
         AC_CHECK_TARGET_TOOL([OBJDUMP],[objdump])
 
         if test "$Genlib" != ""; then
@@ -346,9 +344,7 @@ else
 fi
 
 if test "$HostOS" = "mingw32"; then
-    DllWrapCmd="$DllWrap"
     WindresCmd="$Windres"
-    AC_SUBST([DllWrapCmd])
     AC_SUBST([WindresCmd])
     AC_SUBST([GenlibCmd])
     AC_SUBST([HAVE_GENLIB])
@@ -1238,7 +1234,6 @@ echo "\
    otool        : $OtoolCmd
    install_name_tool : $InstallNameToolCmd
    windres      : $WindresCmd
-   dllwrap      : $DllWrapCmd
    genlib       : $GenlibCmd
    Happy        : $HappyCmd ($HappyVersion)
    Alex         : $AlexCmd ($AlexVersion)


=====================================
hadrian/bindist/Makefile
=====================================
@@ -103,7 +103,6 @@ lib/settings : config.mk
 	@echo ',("otool command", "$(SettingsOtoolCommand)")' >> $@
 	@echo ',("install_name_tool command", "$(SettingsInstallNameToolCommand)")' >> $@
 	@echo ',("touch command", "$(SettingsTouchCommand)")' >> $@
-	@echo ',("dllwrap command", "$(SettingsDllWrapCommand)")' >> $@
 	@echo ',("windres command", "$(SettingsWindresCommand)")' >> $@
 	@echo ',("unlit command", "$$topdir/bin/$(CrossCompilePrefix)unlit")' >> $@
 	@echo ',("cross compiling", "$(CrossCompiling)")' >> $@


=====================================
hadrian/bindist/config.mk.in
=====================================
@@ -271,7 +271,6 @@ SettingsArCommand = @SettingsArCommand@
 SettingsOtoolCommand = @SettingsOtoolCommand@
 SettingsInstallNameToolCommand = @SettingsInstallNameToolCommand@
 SettingsRanlibCommand = @SettingsRanlibCommand@
-SettingsDllWrapCommand = @SettingsDllWrapCommand@
 SettingsWindresCommand = @SettingsWindresCommand@
 SettingsLibtoolCommand = @SettingsLibtoolCommand@
 SettingsTouchCommand = @SettingsTouchCommand@


=====================================
hadrian/cfg/system.config.in
=====================================
@@ -155,7 +155,6 @@ settings-ar-command = @SettingsArCommand@
 settings-ranlib-command = @SettingsRanlibCommand@
 settings-otool-command = @SettingsOtoolCommand@
 settings-install_name_tool-command = @SettingsInstallNameToolCommand@
-settings-dll-wrap-command = @SettingsDllWrapCommand@
 settings-windres-command = @SettingsWindresCommand@
 settings-touch-command = @SettingsTouchCommand@
 settings-llc-command = @SettingsLlcCommand@


=====================================
hadrian/src/Oracles/Setting.hs
=====================================
@@ -123,7 +123,6 @@ data SettingsFileSetting
     | SettingsFileSetting_RanlibCommand
     | SettingsFileSetting_OtoolCommand
     | SettingsFileSetting_InstallNameToolCommand
-    | SettingsFileSetting_DllWrapCommand
     | SettingsFileSetting_WindresCommand
     | SettingsFileSetting_TouchCommand
     | SettingsFileSetting_LlcCommand
@@ -220,7 +219,6 @@ settingsFileSetting key = lookupSystemConfig $ case key of
     SettingsFileSetting_RanlibCommand -> "settings-ranlib-command"
     SettingsFileSetting_OtoolCommand -> "settings-otool-command"
     SettingsFileSetting_InstallNameToolCommand -> "settings-install_name_tool-command"
-    SettingsFileSetting_DllWrapCommand -> "settings-dll-wrap-command"
     SettingsFileSetting_WindresCommand -> "settings-windres-command"
     SettingsFileSetting_TouchCommand -> "settings-touch-command"
     SettingsFileSetting_LlcCommand -> "settings-llc-command"


=====================================
hadrian/src/Rules/Generate.hs
=====================================
@@ -462,7 +462,6 @@ generateSettings = do
         , ("otool command", expr $ settingsFileSetting SettingsFileSetting_OtoolCommand)
         , ("install_name_tool command", expr $ settingsFileSetting SettingsFileSetting_InstallNameToolCommand)
         , ("touch command", expr $ settingsFileSetting SettingsFileSetting_TouchCommand)
-        , ("dllwrap command", expr $ settingsFileSetting SettingsFileSetting_DllWrapCommand)
         , ("windres command", expr $ settingsFileSetting SettingsFileSetting_WindresCommand)
         , ("unlit command", ("$topdir/bin/" <>) <$> expr (programName (ctx { Context.package = unlit })))
         , ("cross compiling", expr $ yesNo <$> flag CrossCompiling)


=====================================
m4/fp_settings.m4
=====================================
@@ -23,7 +23,6 @@ AC_DEFUN([FP_SETTINGS],
         SettingsMergeObjectsFlags=""
         SettingsArCommand="${mingw_bin_prefix}llvm-ar.exe"
         SettingsRanlibCommand="${mingw_bin_prefix}llvm-ranlib.exe"
-        SettingsDllWrapCommand="${mingw_bin_prefix}llvm-dllwrap.exe"
         SettingsWindresCommand="${mingw_bin_prefix}llvm-windres.exe"
         SettingsTouchCommand='$$topdir/bin/touchy.exe'
 
@@ -45,11 +44,6 @@ AC_DEFUN([FP_SETTINGS],
         SettingsMergeObjectsCommand="$MergeObjsCmd"
         SettingsMergeObjectsFlags="$MergeObjsArgs"
 
-        if test -z "$DllWrapCmd"; then
-            SettingsDllWrapCommand="/bin/false"
-        else
-            SettingsDllWrapCommand="$DllWrapCmd"
-        fi
         if test -z "$WindresCmd"; then
             SettingsWindresCommand="/bin/false"
         else
@@ -70,7 +64,6 @@ AC_DEFUN([FP_SETTINGS],
             SettingsLdCommand="$(basename $SettingsLdCommand)"
             SettingsMergeObjectsCommand="$(basename $SettingsMergeObjectsCommand)"
             SettingsArCommand="$(basename $SettingsArCommand)"
-            SettingsDllWrapCommand="$(basename $SettingsDllWrapCommand)"
             SettingsWindresCommand="$(basename $SettingsWindresCommand)"
         fi
     fi
@@ -115,7 +108,6 @@ AC_DEFUN([FP_SETTINGS],
     AC_SUBST(SettingsRanlibCommand)
     AC_SUBST(SettingsOtoolCommand)
     AC_SUBST(SettingsInstallNameToolCommand)
-    AC_SUBST(SettingsDllWrapCommand)
     AC_SUBST(SettingsWindresCommand)
     AC_SUBST(SettingsTouchCommand)
     AC_SUBST(SettingsLlcCommand)


=====================================
testsuite/tests/safeHaskell/flags/Flags02.hs
=====================================
@@ -1,5 +1,5 @@
 {-# LANGUAGE Haskell2010 #-}
-{-# OPTIONS_GHC -pgmdll pgmdll, -I., -L., -Uggg, -Dggg, -with-rtsopts full #-}
+{-# OPTIONS_GHC -I., -L., -Uggg, -Dggg, -with-rtsopts full #-}
 
 -- | These are all flags that should be allowed
 module Flags02 where



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/1d452ce8276789348e35e45ff3bb0097e19761af

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/1d452ce8276789348e35e45ff3bb0097e19761af
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20230712/0537c566/attachment-0001.html>


More information about the ghc-commits mailing list