diff options
| author | panne <unknown> | 2000-04-20 15:22:54 +0000 |
|---|---|---|
| committer | panne <unknown> | 2000-04-20 15:22:54 +0000 |
| commit | 969bf5def3ed69d7ec196fde4fdf48d431fffa55 (patch) | |
| tree | 560af0e9976053ac08c8539a0c2f49942012a02e /mk | |
| parent | 952a3281857c932ced9a7e6cbb08a0b5094ccc85 (diff) | |
| download | haskell-969bf5def3ed69d7ec196fde4fdf48d431fffa55.tar.gz | |
[project @ 2000-04-20 15:22:54 by panne]
Improved rules for stubs. Not perfect yet, but better than before.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/suffix.mk | 4 | ||||
| -rw-r--r-- | mk/target.mk | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/mk/suffix.mk b/mk/suffix.mk index 79d6c7d6a2..9e086ecf29 100644 --- a/mk/suffix.mk +++ b/mk/suffix.mk @@ -142,6 +142,10 @@ endif @$(RM) $@ $(FLEX) -t $(FLEX_OPTS) $< > $@ || ( $(RM) $@ && exit 1 ) +# stubs are automatically generated and compiled by GHC +%_stub.$(way_)o: %.o + @: + #----------------------------------------------------------------------------- # Yacc stuff diff --git a/mk/target.mk b/mk/target.mk index d5fa97e648..7afcf5170e 100644 --- a/mk/target.mk +++ b/mk/target.mk @@ -437,7 +437,7 @@ all :: $(LIBRARY) define BUILD_LIB $(RM) $@ -$(AR) $(AR_OPTS) $@ $(LIBOBJS) +$(AR) $(AR_OPTS) $@ $(STUBOBJS) $(LIBOBJS) $(RANLIB) $@ endef @@ -455,7 +455,7 @@ SRC_HC_OPTS += -split-objs define BUILD_LIB $(RM) $@ -TMPDIR=$(TMPDIR); export TMPDIR; $(FIND) $(patsubst %.$(way_)o,%,$(LIBOBJS)) -name '*.$(way_)o' -print | xargs ar q $@ +TMPDIR=$(TMPDIR); export TMPDIR; ( echo $(STUBOBJS) ; $(FIND) $(patsubst %.$(way_)o,%,$(LIBOBJS)) -name '*.$(way_)o' -print ) | xargs ar q $@ $(RANLIB) $@ endef @@ -499,7 +499,7 @@ SRC_HC_POST_OPTS += \ endif endif -$(LIBRARY) :: $(LIBOBJS) +$(LIBRARY) :: $(STUBOBJS) $(LIBOBJS) $(BUILD_LIB) endif |