X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FMakefile;h=f769ca24ab4e547d548b01b22fd10492da478d4f;hb=c137ecd7e6e83d0f9c39b15ccdb9f2355f243c91;hp=dc0709760a7b3a94390afc9092006d2d10e4071c;hpb=8e29403965d33468b2200ef647e9d4829d251998;p=ghc-hetmet.git

diff --git a/ghc/includes/Makefile b/ghc/includes/Makefile
index dc07097..f769ca2 100644
--- a/ghc/includes/Makefile
+++ b/ghc/includes/Makefile
@@ -1,6 +1,4 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.29 2005/03/22 11:53:48 simonmar Exp $
-#
 
 TOP = ..
 include $(TOP)/mk/boilerplate.mk
@@ -17,6 +15,8 @@ ifeq "$(GhcUnregisterised)" "YES"
 SRC_CC_OPTS += -DNO_REGS -DUSE_MINIINTERPRETER
 endif
 
+SRC_CC_OPTS += -I. -I../rts
+
 #
 # Header file built from the configure script's findings
 #
@@ -36,6 +36,14 @@ gmp.h : $(FPTOOLS_TOP)/ghc/rts/gmp/gmp.h
 # definitions to avoid clashes), prepending some make variables specifying cpp
 # platform variables.
 
+ifneq "$(TARGETPLATFORM)"  "$(HOSTPLATFORM)"
+
+$(H_CONFIG) :
+	@echo "*** Cross-compiling: please copy $(H_CONFIG) from the target system"
+	@exit 1
+
+else
+
 $(H_CONFIG) : $(FPTOOLS_TOP)/mk/config.h $(FPTOOLS_TOP)/mk/config.mk
 
 $(H_CONFIG) : Makefile
@@ -46,6 +54,8 @@ $(H_CONFIG) : Makefile
 	@echo "#endif /* __GHCAUTOCONF_H__ */"          >> $@
 	@echo "Done."
 
+endif
+
 $(H_PLATFORM) : Makefile
 	@echo "Creating $@..."
 	@$(RM) $@
@@ -95,6 +105,14 @@ endif
 
 all :: DerivedConstants.h
 
+ifneq "$(TARGETPLATFORM)" "$(HOSTPLATFORM)"
+
+DerivedConstants.h :
+	@echo "*** Cross-compiling: please copy DerivedConstants.h from the target system"
+	@exit 1
+
+else
+
 mkDerivedConstants.c : $(H_CONFIG)
 
 mkDerivedConstantsHdr : mkDerivedConstants.o
@@ -103,6 +121,8 @@ mkDerivedConstantsHdr : mkDerivedConstants.o
 DerivedConstants.h : mkDerivedConstantsHdr
 	./mkDerivedConstantsHdr >$@
 
+endif
+
 CLEAN_FILES += mkDerivedConstantsHdr$(exeext) DerivedConstants.h
 
 # -----------------------------------------------------------------------------
@@ -110,15 +130,25 @@ CLEAN_FILES += mkDerivedConstantsHdr$(exeext) DerivedConstants.h
 
 all :: GHCConstants.h
 
+ifneq "$(TARGETPLATFORM)" "$(HOSTPLATFORM)"
+
+GHCConstants.h :
+	@echo "*** Cross-compiling: please copy DerivedConstants.h from the target system"
+	@exit 1
+
+else
+
 mkGHCConstants : mkGHCConstants.o
 	$(CC) -o $@ $(CC_OPTS) $(LD_OPTS) mkGHCConstants.o
 
 mkGHCConstants.o : mkDerivedConstants.c
-	$(CC) -o $@ -c $<  -DGEN_HASKELL
+	$(CC) -o $@ $(CC_OPTS) -c $<  -DGEN_HASKELL
 
 GHCConstants.h : mkGHCConstants
 	./mkGHCConstants >$@
 
+endif
+
 CLEAN_FILES += mkGHCConstants$(exeext) GHCConstants.h
 
 # ---------------------------------------------------------------------------