diff options
| author | Ian Lynagh <igloo@earth.li> | 2009-05-13 16:05:31 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2009-05-13 16:05:31 +0000 |
| commit | 24adfcd0544942dff994b75f7dd5f72ab3e3d0f4 (patch) | |
| tree | 4f98abd09a31d17d15b3fb79ae41f342de044f3c /rules/build-prog.mk | |
| parent | 9a4ef343a46e823bcf949af8501c13cc8ca98fb1 (diff) | |
| download | haskell-24adfcd0544942dff994b75f7dd5f72ab3e3d0f4.tar.gz | |
Fix building dph in the new build system
Diffstat (limited to 'rules/build-prog.mk')
| -rw-r--r-- | rules/build-prog.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/rules/build-prog.mk b/rules/build-prog.mk index f5412fbab4..8f01e66b7b 100644 --- a/rules/build-prog.mk +++ b/rules/build-prog.mk @@ -100,14 +100,14 @@ $1/$2/build/tmp/$$($1_$2_PROG) : $$($1_$2_v_HS_OBJS) $$($1_$2_v_C_OBJS) $$($1_$2 $$($1_$2_HC) -o $$@ $$($1_$2_v_ALL_HC_OPTS) $$(LD_OPTS) $$($1_$2_v_HS_OBJS) $$($1_$2_v_C_OBJS) $$($1_$2_v_S_OBJS) $$($1_$2_OTHER_OBJS) # Note [lib-depends] if this program is built with stage1 or greater, we -# need to depend on the libraries too. NB. since $(ALL_LIBS) and +# need to depend on the libraries too. NB. since $(ALL_STAGE1_LIBS) and # $(ALL_RTS_LIBS) are not defined until after libraries/*/ghc.mk have # been included, this introduces an ordering dependency. ifneq "$3" "0" -ifeq "$$(ALL_LIBS)" "" -$$(error ordering failure in $1: $$(ALL_LIBS) is empty) +ifeq "$$(ALL_STAGE1_LIBS)" "" +$$(error ordering failure in $1: $$(ALL_STAGE1_LIBS) is empty) endif -$1/$2/build/tmp/$($1_$2_PROG) : $$(ALL_LIBS) $$(ALL_RTS_LIBS) $$(OTHER_LIBS) +$1/$2/build/tmp/$($1_$2_PROG) : $$(ALL_STAGE1_LIBS) $$(ALL_RTS_LIBS) $$(OTHER_LIBS) endif endif |