From 88e65770ac9e96a68959edb2284a700425cdb1f7 Mon Sep 17 00:00:00 2001
From: simonmar <unknown>
Date: Wed, 16 Jun 1999 09:33:14 +0000
Subject: [PATCH] [project @ 1999-06-16 09:33:10 by simonmar] Make use of the
$(GhcWithRegisterised) build flag from config.mk. You can now get an
unregisterised build by *either*
- setting GhcWithRegisterised to NO in build.mk, or
- adding 'u' to GhcLibWays.
The former will make all compilations unregisterised, whereas the
latter will require a '-unreg' flag to be passed to the compiler to
get the unregisterised build.
---
ghc/driver/Makefile | 4 ++--
ghc/driver/ghc.lprl | 5 +++--
mk/config.mk.in | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ghc/driver/Makefile b/ghc/driver/Makefile
index e6b7fec6e98a..d8c3ccc689a1 100644
--- a/ghc/driver/Makefile
+++ b/ghc/driver/Makefile
@@ -45,8 +45,8 @@ SCRIPT_SUBST_VARS := \
GHC_LIB_DIR GHC_RUNTIME_DIR GHC_UTILS_DIR GHC_INCLUDE_DIR \
GHC_OPT_HILEV_ASM GhcWithNativeCodeGen LeadingUnderscore\
GHC_UNLIT GHC_HSCPP GHC_HSC GHC_SYSMAN EnableWin32DLLs \
- CP RM CONTEXT_DIFF LibGmp \
- $(USER_WAY_NAMES) $(USER_WAY_OPTS)
+ CP RM CONTEXT_DIFF LibGmp GhcWithRegisterised \
+ USER_WAY_NAMES USER_WAY_OPTS
#
# When creating a binary distribution, we prefix the driver script
diff --git a/ghc/driver/ghc.lprl b/ghc/driver/ghc.lprl
index 95033399df76..745f96881245 100644
--- a/ghc/driver/ghc.lprl
+++ b/ghc/driver/ghc.lprl
@@ -120,6 +120,8 @@ WAY_*_NAME WAY_*_REAL_OPTS
LeadingUnderscore
+GhcWithRegisterised
+
\end{verbatim}
Establish what executables to run for the various phases, what the
@@ -478,7 +480,7 @@ $UNPROFscc_auto = ''; # set to relevant hsc flag if forcing auto sccs without pr
$TICKYing = ''; # set to t if compiling for ticky-ticky profiling
$PARing = ''; # set to p if compiling for PAR
$GRANing = ''; # set to g if compiling for GRAN
-$UNREGing = ''; # set to u if compiling unregisterised
+$UNREGing = ($GhcWithRegisterised eq 'YES') ? '' : 'u';
$Specific_hi_file = ''; # set by -ohi <file>; "-" for stdout
$Specific_dump_file = ''; # set by -odump <file>; "-" for stdout
$Using_dump_file = 0;
@@ -908,7 +910,6 @@ sub setupBuildFlags {
} elsif ( $UNREGing eq 'u' ) {
$BuildTag = '_u';
}
-
\end{code}
After the sanity checks, add flags to the necessary parts of the driver pipeline:
diff --git a/mk/config.mk.in b/mk/config.mk.in
index 901b2d1dc8c5..1bae84b0cc85 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -183,7 +183,7 @@ GhcUseGccForOptAsm=YES
GhcUseGccForDebuggingAsm=YES
# Build a registerised version of hsc and runtime
-# (you'd be desperate or silly not to).
+# (unregisterised used for Hugs at the moment)
GhcWithRegisterised=YES
# Build a compiler with a native code generator backend
--
GitLab