Commit e3b8ed25 authored by simonm's avatar simonm
Browse files

[project @ 1998-12-03 15:24:08 by simonm]

merge from 4.01
parent f48f5a96
...@@ -28,5 +28,6 @@ TOP:=$(GHC_TOP) ...@@ -28,5 +28,6 @@ TOP:=$(GHC_TOP)
-include $(TOP)/mk/paths.mk -include $(TOP)/mk/paths.mk
-include $(TOP)/mk/opts.mk -include $(TOP)/mk/opts.mk
-include $(TOP)/mk/version.mk
include $(TOP)/mk/suffix.mk include $(TOP)/mk/suffix.mk
...@@ -37,7 +37,7 @@ endif ...@@ -37,7 +37,7 @@ endif
GHC_DRIVER_DIR = $(TOP)/driver GHC_DRIVER_DIR = $(TOP)/driver
GHC_COMPILER_DIR = $(TOP)/compiler GHC_COMPILER_DIR = $(TOP)/compiler
GHC_RUNTIME_DIR = $(TOP)/runtime GHC_RUNTIME_DIR = $(TOP)/rts
GHC_LIB_DIR = $(TOP)/lib GHC_LIB_DIR = $(TOP)/lib
GHC_INCLUDE_DIR = $(TOP)/includes GHC_INCLUDE_DIR = $(TOP)/includes
GHC_UTILS_DIR = $(TOP)/utils GHC_UTILS_DIR = $(TOP)/utils
...@@ -69,6 +69,3 @@ MKDEPENDHS_SRCS = $(HS_SRCS) ...@@ -69,6 +69,3 @@ MKDEPENDHS_SRCS = $(HS_SRCS)
else else
MKDEPENDHS_SRCS = MKDEPENDHS_SRCS =
endif endif
# temporary until the new RTS is merged in.
MOSTLY_CLEAN_FILES += *.hc
################################################################################# #################################################################################
# #
# $Id: suffix.mk,v 1.4 1998/08/14 12:27:45 sof Exp $ # $Id: suffix.mk,v 1.5 1998/12/03 15:24:08 simonm Exp $
# #
# GHC-specific suffix rules # GHC-specific suffix rules
# #
......
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
ProjectName = The Glorious Glasgow Haskell Compilation System ProjectName = The Glorious Glasgow Haskell Compilation System
ProjectNameShort = ghc ProjectNameShort = ghc
ProjectVersion = 3.03 ProjectVersion = 4.01
ProjectVersionInt = 303 ProjectVersionInt = 401
ProjectPatchLevel = 0 ProjectPatchLevel = 0
# #
...@@ -35,7 +35,15 @@ ProjectPatchLevel = 0 ...@@ -35,7 +35,15 @@ ProjectPatchLevel = 0
# version - one (semi-valid) reason for having them separate is that # version - one (semi-valid) reason for having them separate is that
# object files produced by different versions of the compiler need # object files produced by different versions of the compiler need
# not be incompatible.. # not be incompatible..
HscMajorVersion=33 HscMajorVersion=40
HscMinorVersion=0 HscMinorVersion=0
CcMajorVersion=36 CcMajorVersion=36
CcMinorVersion=1 CcMinorVersion=1
#
# Interface file version
#
# If you should happen to make changes to the interface file format
# that will break compatibility with older versions, up this variable.
#
HscIfaceFileVersion=5
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment