projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2003-11-06 17:09:50 by simonpj]
[ghc-hetmet.git]
/
ghc
/
utils
/
hsc2hs
/
Makefile
diff --git
a/ghc/utils/hsc2hs/Makefile
b/ghc/utils/hsc2hs/Makefile
index
23a9b1f
..
562803a
100644
(file)
--- a/
ghc/utils/hsc2hs/Makefile
+++ b/
ghc/utils/hsc2hs/Makefile
@@
-1,5
+1,5
@@
# -----------------------------------------------------------------------------
# -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.33 2002/05/29 22:32:50 sof Exp $
+# $Id: Makefile,v 1.38 2003/06/04 15:18:30 panne Exp $
TOP=../..
include $(TOP)/mk/boilerplate.mk
TOP=../..
include $(TOP)/mk/boilerplate.mk
@@
-17,11
+17,13
@@
ifeq "$(HOSTPLATFORM)" "i386-unknown-cygwinw32"
HS_PROG = hsc2hs$(exeext)
endif
HS_PROG = hsc2hs$(exeext)
endif
-SRC_HC_OPTS += -package util -cpp
+ghc_ge_504 = $(shell if (test $(GhcCanonVersion) -ge 504); then echo YES; else echo NO; fi)
-ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
-SRC_HC_OPTS += -package win32 '-\#include <process.h>'
-endif
+ifeq "$(ghc_ge_504)" "NO"
+SRC_HC_OPTS += -package util
+endif
+
+SRC_HC_OPTS += -cpp
ifneq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
INSTALLED_SCRIPT_PROG = hsc2hs
ifneq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
INSTALLED_SCRIPT_PROG = hsc2hs
@@
-48,13
+50,13
@@
HSC2HS_EXTRA=--cc=$(bindir)/ghc-$(ProjectVersion)
endif # BIN_DIST
else
HSC2HS_BINDIR=$(FPTOOLS_TOP_ABS)/$(CURRENT_DIR)
endif # BIN_DIST
else
HSC2HS_BINDIR=$(FPTOOLS_TOP_ABS)/$(CURRENT_DIR)
-HSC2HS_DIR=$(FPTOOLS_TOP_ABS)/$(CURRENT_DIR)
+HSC2HS_DIR=$(FPTOOLS_TOP_ABS_PLATFORM)/$(CURRENT_DIR)
ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
extra_flags=$(addprefix --cflag=,$(filter-out -O,$(SRC_CC_OPTS)))
endif
ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
extra_flags=$(addprefix --cflag=,$(filter-out -O,$(SRC_CC_OPTS)))
endif
-HSC2HS_EXTRA="--cc=$(CC) $(extra_flags) --cflag=-D__GLASGOW_HASKELL__=$(ProjectVersionInt) -I$(FPTOOLS_TOP_ABS)/$(INCLUDE_DIR)"
+HSC2HS_EXTRA="--cc=$(CC) --ld=$(CC) $(extra_flags) --cflag=-D__GLASGOW_HASKELL__=$(ProjectVersionInt) -I$(FPTOOLS_TOP_ABS_PLATFORM)/$(INCLUDE_DIR)"
endif
$(SCRIPT_PROG) : Makefile
endif
$(SCRIPT_PROG) : Makefile