From 0fc38bc29078ca6d2829615441c477c006aae7d4 Mon Sep 17 00:00:00 2001 From: simonmar Date: Fri, 1 Feb 2002 15:18:19 +0000 Subject: [PATCH] [project @ 2002-02-01 15:18:18 by simonmar] Include the patchlevel in the hi version number. --- ghc/compiler/Makefile | 3 ++- ghc/compiler/main/CmdLineOpts.lhs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile index 1f1b64d..39ea131 100644 --- a/ghc/compiler/Makefile +++ b/ghc/compiler/Makefile @@ -1,5 +1,5 @@ # ----------------------------------------------------------------------------- -# $Id: Makefile,v 1.205 2002/01/30 14:05:01 simonmar Exp $ +# $Id: Makefile,v 1.206 2002/02/01 15:18:18 simonmar Exp $ TOP = .. @@ -50,6 +50,7 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile @echo "cProjectName = \"$(ProjectName)\"" >> $(CONFIG_HS) @echo "cProjectVersion = \"$(ProjectVersion)\"" >> $(CONFIG_HS) @echo "cProjectVersionInt = \"$(ProjectVersionInt)\"" >> $(CONFIG_HS) + @echo "cProjectPatchLevel = \"$(ProjectPatchLevel)\"" >> $(CONFIG_HS) @echo "cBooterVersion = \"$(GhcVersion)\"" >> $(CONFIG_HS) @echo "cHscIfaceFileVersion = \"$(HscIfaceFileVersion)\"" >> $(CONFIG_HS) @echo "cHOSTPLATFORM = \"$(HOSTPLATFORM)\"" >> $(CONFIG_HS) diff --git a/ghc/compiler/main/CmdLineOpts.lhs b/ghc/compiler/main/CmdLineOpts.lhs index e6fadc0..e19c24a 100644 --- a/ghc/compiler/main/CmdLineOpts.lhs +++ b/ghc/compiler/main/CmdLineOpts.lhs @@ -589,7 +589,7 @@ opt_InPackage = case lookup_str "-inpackage=" of opt_EmitCExternDecls = lookUp SLIT("-femit-extern-decls") opt_EnsureSplittableC = lookUp SLIT("-fglobalise-toplev-names") opt_GranMacros = lookUp SLIT("-fgransim") -opt_HiVersion = read cProjectVersionInt :: Int +opt_HiVersion = read (cProjectVersionInt ++ cProjectPatchLevel) :: Int opt_HistorySize = lookup_def_int "-fhistory-size" 20 opt_IgnoreAsserts = lookUp SLIT("-fignore-asserts") opt_IgnoreIfacePragmas = lookUp SLIT("-fignore-interface-pragmas") -- 1.7.10.4