From 6dfdf14602aa8bc86ad99fc46002f9cd23d21e77 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Wed, 15 Aug 2007 17:36:49 +0000 Subject: [PATCH] Stop ghc-6.7 linking in ghc-inplace.o --- compiler/Makefile | 5 ++--- compiler/Makefile.ghcbin | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/compiler/Makefile b/compiler/Makefile index e85706b..e472791 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -709,9 +709,8 @@ SRC_LD_OPTS += -no-link-chk # See comments in $(FPTOOLS_TOP)/utils/ghc-pkg/Makefile for why we use # a real binary here rather than a shell script. -INPLACE_C = ghc-inplace.c INPLACE_PROG = $(odir)/ghc-inplace$(exeext) -EXCLUDED_SRCS += $(INPLACE_C) +EXCLUDED_C_SRCS += ghc-inplace.c # FPTOOLS_TOP_ABS platform uses backslashes, at least on Cygwin, but that # will go wrong when we use it in a Haskell string below. @@ -719,7 +718,7 @@ TOP_ABS=$(subst \\,/,$(FPTOOLS_TOP_ABS_PLATFORM)) GHC_PATH=$(TOP_ABS)/$(GHC_COMPILER_DIR_REL)/$(GHC_PROG) -$(INPLACE_PROG): $(INPLACE_C) +$(INPLACE_PROG): ghc-inplace.c $(HC) -cpp -optc-DGHC_PATH=\"$(GHC_PATH)\" -optc-DTOP_ABS=\"$(TOP_ABS)\" $< -o $@ all :: $(INPLACE_PROG) diff --git a/compiler/Makefile.ghcbin b/compiler/Makefile.ghcbin index 4008f25..e75aad6 100644 --- a/compiler/Makefile.ghcbin +++ b/compiler/Makefile.ghcbin @@ -17,6 +17,8 @@ ifeq "$(stage)" "3" HC=$(GHC_STAGE2) endif +EXCLUDED_C_SRCS += ghc-inplace.c + SRC_HC_OPTS += -package ghc SRC_HC_OPTS += -Istage$(stage) SRC_HC_OPTS += \ -- 1.7.10.4