projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
9917b74
)
fix stage1_libs pseudo-target
author
Simon Marlow
<marlowsd@gmail.com>
Tue, 26 Oct 2010 12:29:06 +0000
(12:29 +0000)
committer
Simon Marlow
<marlowsd@gmail.com>
Tue, 26 Oct 2010 12:29:06 +0000
(12:29 +0000)
ghc.mk
patch
|
blob
|
history
diff --git
a/ghc.mk
b/ghc.mk
index
1545f4d
..
df51855
100644
(file)
--- a/
ghc.mk
+++ b/
ghc.mk
@@
-458,9
+458,6
@@
ifeq "$(BuildSharedLibs)" "YES"
ALL_STAGE1_LIBS += $(foreach lib,$(PACKAGES),$(libraries/$(lib)_dist-install_dyn_LIB))
endif
BOOT_LIBS = $(foreach lib,$(STAGE0_PACKAGES),$(libraries/$(lib)_dist-boot_v_LIB))
ALL_STAGE1_LIBS += $(foreach lib,$(PACKAGES),$(libraries/$(lib)_dist-install_dyn_LIB))
endif
BOOT_LIBS = $(foreach lib,$(STAGE0_PACKAGES),$(libraries/$(lib)_dist-boot_v_LIB))
-# A useful pseudo-target
-.PHONY: stage1_libs
-stage1_libs : $(ALL_STAGE1_LIBS)
OTHER_LIBS = libffi/dist-install/build/libHSffi$(v_libsuf) libffi/dist-install/build/HSffi.o
ifeq "$(BuildSharedLibs)" "YES"
OTHER_LIBS = libffi/dist-install/build/libHSffi$(v_libsuf) libffi/dist-install/build/HSffi.o
ifeq "$(BuildSharedLibs)" "YES"
@@
-679,6
+676,11
@@
endif
include $(patsubst %, %/ghc.mk, $(BUILD_DIRS))
include $(patsubst %, %/ghc.mk, $(BUILD_DIRS))
+# A useful pseudo-target (must be after the include above, because it needs
+# the value of things like $(libraries/base_dist-install_v_LIB).
+.PHONY: stage1_libs
+stage1_libs : $(ALL_STAGE1_LIBS)
+
# ----------------------------------------------
# Per-package compiler flags
#
# ----------------------------------------------
# Per-package compiler flags
#