projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f18200e
)
Windows fixes
author
Ian Lynagh
<igloo@earth.li>
Wed, 16 Jul 2008 22:27:19 +0000
(22:27 +0000)
committer
Ian Lynagh
<igloo@earth.li>
Wed, 16 Jul 2008 22:27:19 +0000
(22:27 +0000)
compiler/Makefile
patch
|
blob
|
history
diff --git
a/compiler/Makefile
b/compiler/Makefile
index
dbc4725
..
f32e020
100644
(file)
--- a/
compiler/Makefile
+++ b/
compiler/Makefile
@@
-59,6
+59,7
@@
clean distclean::
$(RM) -f prelude/primops.txt
$(RM) -f $(PRIMOP_BITS)
$(RM) -f $(CONFIG_HS)
$(RM) -f prelude/primops.txt
$(RM) -f $(PRIMOP_BITS)
$(RM) -f $(CONFIG_HS)
+ $(RM) -f parser/Parser.y
ifeq "$(GhcWithInterpreter)" "YES"
CONFIGURE_FLAGS_STAGE2 += --flags=ghci
ifeq "$(GhcWithInterpreter)" "YES"
CONFIGURE_FLAGS_STAGE2 += --flags=ghci
@@
-140,7
+141,10
@@
ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
# stdcall, and doesn't generate the Foo@8 name for them
# As it's only important for older compilers we don't need to do anything
# for stage2+.
# stdcall, and doesn't generate the Foo@8 name for them
# As it's only important for older compilers we don't need to do anything
# for stage2+.
-CONFIGURE_FLAGS_STAGE1 += --ghc-options='-\#include <windows.h> -\#include <process.h>'
+CONFIGURE_FLAGS_STAGE1 += --ghc-option='-\#include' \
+ --ghc-option='"<windows.h>"' \
+ --ghc-option='-\#include' \
+ --ghc-option='"<process.h>"'
endif
# ghc_strlen percolates through so many modules that it is easier to get its
endif
# ghc_strlen percolates through so many modules that it is easier to get its
@@
-189,6
+193,8
@@
boot :: stage_dirs
boot :: $(CONFIG_HS)
boot :: $(CONFIG_HS)
+boot :: parser/Parser.y
+
$(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk
@$(RM) -f $(CONFIG_HS)
@echo "Creating $(CONFIG_HS) ... "
$(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk
@$(RM) -f $(CONFIG_HS)
@echo "Creating $(CONFIG_HS) ... "