[commit: ghc] wip/nfs-locking: Drop SUPPORTS_COMPONENT_ID which is no longer provided by configure. (72ed36f)

[git at git.haskell.org]

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

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/72ed36f9bfb99fc239d84026945e2b47446005ed/ghc

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

commit 72ed36f9bfb99fc239d84026945e2b47446005ed
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Mon Jan 4 13:14:51 2016 +0000

    Drop SUPPORTS_COMPONENT_ID which is no longer provided by configure.


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

72ed36f9bfb99fc239d84026945e2b47446005ed
 cfg/system.config.in         |  1 -
 src/Oracles/Config/Flag.hs   |  2 --
 src/Settings/Builders/Ghc.hs | 13 ++++---------
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/cfg/system.config.in b/cfg/system.config.in
index 7f9b8de..292d91f 100644
--- a/cfg/system.config.in
+++ b/cfg/system.config.in
@@ -53,7 +53,6 @@ cc-clang-backend    = @CC_CLANG_BACKEND@
 # Build options:
 #===============
 
-supports-component-id = @SUPPORTS_COMPONENT_ID@
 solaris-broken-shld   = @SOLARIS_BROKEN_SHLD@
 split-objects-broken  = @SplitObjsBroken@
 ghc-unregisterised    = @Unregisterised@
diff --git a/src/Oracles/Config/Flag.hs b/src/Oracles/Config/Flag.hs
index d40b762..44e8a17 100644
--- a/src/Oracles/Config/Flag.hs
+++ b/src/Oracles/Config/Flag.hs
@@ -18,7 +18,6 @@ data Flag = ArSupportsAtFile
           | LeadingUnderscore
           | SolarisBrokenShld
           | SplitObjectsBroken
-          | SupportsComponentId
           | WithLibdw
 
 -- Note, if a flag is set to empty string we treat it as set to NO. This seems
@@ -34,7 +33,6 @@ flag f = do
         LeadingUnderscore  -> "leading-underscore"
         SolarisBrokenShld  -> "solaris-broken-shld"
         SplitObjectsBroken -> "split-objects-broken"
-        SupportsComponentId -> "supports-component-id"
         WithLibdw          -> "with-libdw"
     value <- askConfigWithDefault key . putError
         $ "\nFlag '" ++ key ++ "' not set in configuration files."
diff --git a/src/Settings/Builders/Ghc.hs b/src/Settings/Builders/Ghc.hs
index a0f2678..9a07fc2 100644
--- a/src/Settings/Builders/Ghc.hs
+++ b/src/Settings/Builders/Ghc.hs
@@ -84,19 +84,14 @@ wayGhcArgs = do
 -- TODO: Improve handling of "-hide-all-packages"
 packageGhcArgs :: Args
 packageGhcArgs = do
-    stage               <- getStage
-    pkg                 <- getPackage
-    supportsComponentId <- getFlag SupportsComponentId
-    compId              <- getPkgData ComponentId
-    pkgDepIds           <- getPkgDataList DepIds
+    pkg       <- getPackage
+    compId    <- getPkgData ComponentId
+    pkgDepIds <- getPkgDataList DepIds
     mconcat
         [ arg "-hide-all-packages"
         , arg "-no-user-package-db"
         , bootPackageDbArgs
-        , isLibrary pkg ?
-          if supportsComponentId || stage /= Stage0
-          then arg $ "-this-package-key " ++ compId
-          else arg $ "-package-name "     ++ compId
+        , isLibrary pkg ? (arg $ "-this-package-key " ++ compId)
         , append $ map ("-package-id " ++) pkgDepIds ]
 
 -- TODO: Improve handling of "cabal_macros.h"