projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Initialise PR dictionaries in vectorisation monad
[ghc-hetmet.git]
/
compiler
/
Makefile
diff --git
a/compiler/Makefile
b/compiler/Makefile
index
3f443ac
..
18540d7
100644
(file)
--- a/
compiler/Makefile
+++ b/
compiler/Makefile
@@
-27,6
+27,7
@@
ifeq "$(GhcThreaded)$(GhcProfiled)" "YESYES"
$(error Cannot make GHC both threaded and profiled)
endif
$(error Cannot make GHC both threaded and profiled)
endif
+
#-----------------------------------------------------------------------------
# Counting source code lines
#-----------------------------------------------------------------------------
# Counting source code lines
@@
-89,6
+90,16
@@
ifeq "$(stage)" ""
stage=1
endif
stage=1
endif
+ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
+ifeq "$(stage)" "1"
+DQ = \"
+else
+DQ = \\\"
+endif
+else
+DQ = \"
+endif
+
.DUMMY: stage_dir
stage_dirs :
$(MKDIRHIER) stage$(stage)
.DUMMY: stage_dir
stage_dirs :
$(MKDIRHIER) stage$(stage)
@@
-727,7
+738,7
@@
INPLACE_EXTRA_FLAGS = -optc-DWINDOWS
endif
$(INPLACE_PROG): ghc-inplace.c
endif
$(INPLACE_PROG): ghc-inplace.c
- $(HC) -cpp -optc-DGHC_PATH=\"$(GHC_PATH)\" -optc-DTOP_ABS=\"$(TOP_ABS)\" $(INPLACE_EXTRA_FLAGS) $< -o $@
+ $(HC) -cpp -optc-DGHC_PATH=$(DQ)$(GHC_PATH)$(DQ) -optc-DTOP_ABS=$(DQ)$(TOP_ABS)$(DQ) $(INPLACE_EXTRA_FLAGS) $< -o $@
all :: $(INPLACE_PROG)
all :: $(INPLACE_PROG)
@@
-915,7
+926,7
@@
all :: $(GHC_PROG)
endif
endif
endif
endif
-$(odir)/main/Config.$(way_)o: SRC_HC_OPTS+=-DSTAGE='"$(stage)"'
+$(odir)/main/Config.$(way_)o: SRC_HC_OPTS+=-DSTAGE=$(DQ)$(stage)$(DQ)
#-----------------------------------------------------------------------------
# binary-dist
#-----------------------------------------------------------------------------
# binary-dist