[commit: ghc] wip/angerman/llvmng: GHC.prim use virtual-modules (29704a6)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/angerman/llvmng
Link       : http://ghc.haskell.org/trac/ghc/changeset/29704a66137d43e0af74c31e4c148b4ba2b1cc79/ghc

>---------------------------------------------------------------

commit 29704a66137d43e0af74c31e4c148b4ba2b1cc79
Author: Moritz Angermann <moritz.angermann at gmail.com>
Date:   Fri Nov 10 21:37:18 2017 +0800

    GHC.prim use virtual-modules


>---------------------------------------------------------------

29704a66137d43e0af74c31e4c148b4ba2b1cc79
 ghc.mk                            |  2 +-
 libraries/ghc-prim/ghc-prim.cabal | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/ghc.mk b/ghc.mk
index bce738f..d273614 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -612,7 +612,7 @@ libraries/ghci_dist-install_CONFIGURE_OPTS += --flags=ghci
 # remains compatible with the old build system for the time being).
 # GHC.Prim module in the ghc-prim package with a flag:
 #
-libraries/ghc-prim_CONFIGURE_OPTS += --flag=include-ghc-prim
+# libraries/ghc-prim_CONFIGURE_OPTS += --flag=include-ghc-prim
 
 # And then we strip it out again before building the package:
 define libraries/ghc-prim_PACKAGE_MAGIC
diff --git a/libraries/ghc-prim/ghc-prim.cabal b/libraries/ghc-prim/ghc-prim.cabal
index 5b6b857..7d611bf 100644
--- a/libraries/ghc-prim/ghc-prim.cabal
+++ b/libraries/ghc-prim/ghc-prim.cabal
@@ -19,10 +19,6 @@ source-repository head
     location: http://git.haskell.org/ghc.git
     subdir:   libraries/ghc-prim
 
-flag include-ghc-prim
-    Description: Include GHC.Prim in exposed-modules
-    default: False
-
 custom-setup
     setup-depends: base >= 4 && < 5, Cabal >= 1.23
 
@@ -53,6 +49,9 @@ Library
         GHC.Tuple
         GHC.Types
 
+    virtual-modules:
+        GHC.Prim
+
     -- OS Specific
     if os(windows)
         -- Windows requires some extra libraries for linking because the RTS
@@ -67,9 +66,6 @@ Library
         --         on Windows. Required because of mingw32.
         extra-libraries: user32, mingw32, mingwex
 
-    if flag(include-ghc-prim)
-        exposed-modules: GHC.Prim
-
     c-sources:
         cbits/atomic.c
         cbits/bswap.c