[commit: ghc] ghc-7.10: use projectVersion from DynFlags rather than cProjectVersion for versionedAppDir (c46e4b1)

git at git.haskell.org git at git.haskell.org
Tue Apr 14 12:51:45 UTC 2015


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

On branch  : ghc-7.10
Link       : http://ghc.haskell.org/trac/ghc/changeset/c46e4b184e0abc158ad8f1eff6b3f0421acaf984/ghc

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

commit c46e4b184e0abc158ad8f1eff6b3f0421acaf984
Author: Luite Stegeman <stegeman at gmail.com>
Date:   Tue Apr 14 01:13:27 2015 -0500

    use projectVersion from DynFlags rather than cProjectVersion for versionedAppDir
    
    Reviewed By: edsko, austin
    
    Differential Revision: https://phabricator.haskell.org/D824
    
    GHC Trac Issues: #10232
    
    (cherry picked from commit 6109b312cdd9dfe4bdad4030e0185dd67e6ec18d)


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

c46e4b184e0abc158ad8f1eff6b3f0421acaf984
 compiler/main/DynFlags.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 93c386c..1acdd10 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -1026,7 +1026,7 @@ opt_lc dflags = sOpt_lc (settings dflags)
 versionedAppDir :: DynFlags -> IO FilePath
 versionedAppDir dflags = do
   appdir <- getAppUserDataDirectory (programName dflags)
-  return $ appdir </> (TARGET_ARCH ++ '-':TARGET_OS ++ '-':cProjectVersion)
+  return $ appdir </> (TARGET_ARCH ++ '-':TARGET_OS ++ '-':projectVersion dflags)
 
 -- | The target code type of the compilation (if any).
 --



More information about the ghc-commits mailing list