Drop GhcWithLlvmCodeGen configuration bits

The LLVM code generator is always built unconditionally, so both the
configuration variable in mk/config.mk.in as well as the string in
compilerInfo can be removed.

diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index df07430..fb09a33 100644 (file)
--- a/compiler/ghc.mk
+++ b/compiler/ghc.mk
@@ -82,8 +82,6 @@ compiler/stage%/build/Config.hs : mk/config.mk mk/project.mk | $$(dir $$@)/.
        @echo 'cGhcWithInterpreter   = "$(GhcWithInterpreter)"'             >> $@
        @echo 'cGhcWithNativeCodeGen :: String'                             >> $@
        @echo 'cGhcWithNativeCodeGen = "$(GhcWithNativeCodeGen)"'           >> $@
-       @echo 'cGhcWithLlvmCodeGen   :: String'                             >> $@
-       @echo 'cGhcWithLlvmCodeGen   = "YES"'                               >> $@
        @echo 'cGhcWithSMP           :: String'                             >> $@
        @echo 'cGhcWithSMP           = "$(GhcWithSMP)"'                     >> $@
        @echo 'cGhcRTSWays           :: String'                             >> $@

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index ab755b0..220aa02 100644 (file)
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -2286,7 +2286,6 @@ compilerInfo = [("Project name",                String cProjectName),
                 ("Have interpreter",            String cGhcWithInterpreter),
                 ("Object splitting",            String cSplitObjs),
                 ("Have native code generator",  String cGhcWithNativeCodeGen),
-                ("Have llvm code generator",    String cGhcWithLlvmCodeGen),
                 ("Support SMP",                 String cGhcWithSMP),
                 ("Unregisterised",              String cGhcUnregisterised),
                 ("Tables next to code",         String cGhcEnableTablesNextToCode),

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 902c0dc..7acf824 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -146,9 +146,6 @@ GhcWithNativeCodeGen=$(strip\
     $(if $(filter YESYESNO,\
                  $(OsSupportsNCG)$(ArchSupportsNCG)$(GhcUnregisterised)),YES,NO))
 
-# Build a compiler with the llvm code generator backend
-GhcWithLlvmCodeGen=NO
-
 HaveLibDL = @HaveLibDL@
 
 # ArchSupportsSMP should be set iff there is support for that arch in