projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix make for libffi again, properly this time
[ghc-hetmet.git]
/
ghc
/
ghc.mk
diff --git
a/ghc/ghc.mk
b/ghc/ghc.mk
index
3a3edec
..
d72305c
100644
(file)
--- a/
ghc/ghc.mk
+++ b/
ghc/ghc.mk
@@
-29,11
+29,8
@@
endif
ifeq "$(GhcThreaded)" "YES"
# Use threaded RTS with GHCi, so threads don't get blocked at the prompt.
ifeq "$(GhcThreaded)" "YES"
# Use threaded RTS with GHCi, so threads don't get blocked at the prompt.
-ghc_HC_OPTS += -threaded
-endif
-
-ifeq "$(BuildSharedLibs)" "YES"
-ghc_HC_OPTS += -dynamic
+ghc_stage2_HC_OPTS += -threaded
+ghc_stage3_HC_OPTS += -threaded
endif
# XXX ToDp
endif
# XXX ToDp
@@
-107,6
+104,11
@@
ghc/stage1/build/tmp/$(ghc_stage1_PROG) : $(compiler_stage1_v_LIB)
ghc/stage2/build/tmp/$(ghc_stage2_PROG) : $(compiler_stage2_v_LIB)
ghc/stage3/build/tmp/$(ghc_stage3_PROG) : $(compiler_stage3_v_LIB)
ghc/stage2/build/tmp/$(ghc_stage2_PROG) : $(compiler_stage2_v_LIB)
ghc/stage3/build/tmp/$(ghc_stage3_PROG) : $(compiler_stage3_v_LIB)
+# Modules here import HsVersions.h, so we need ghc_boot_platform.h
+$(ghc_stage1_depfile) : compiler/stage1/$(PLATFORM_H)
+$(ghc_stage2_depfile) : compiler/stage2/$(PLATFORM_H)
+$(ghc_stage3_depfile) : compiler/stage3/$(PLATFORM_H)
+
all_ghc_stage1 : $(GHC_STAGE1)
all_ghc_stage2 : $(GHC_STAGE2)
all_ghc_stage3 : $(GHC_STAGE3)
all_ghc_stage1 : $(GHC_STAGE1)
all_ghc_stage2 : $(GHC_STAGE2)
all_ghc_stage3 : $(GHC_STAGE3)