aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--boehm-gc/ChangeLog5
-rw-r--r--boehm-gc/Makefile.am4
-rw-r--r--boehm-gc/Makefile.in2
3 files changed, 9 insertions, 2 deletions
diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog
index c157b9e..40db8f3 100644
--- a/boehm-gc/ChangeLog
+++ b/boehm-gc/ChangeLog
@@ -1,5 +1,10 @@
1999-07-19 Alexandre Oliva <oliva@dcc.unicamp.br>
+ * Makefile.am (.s.lo): Avoid `#line' directives.
+ * Makefile.in: Rebuilt.
+
+1999-07-19 Alexandre Oliva <oliva@dcc.unicamp.br>
+
* Makefile.am (*-recursive, *-am, *-multi): Automake does not
generate *-recursive for this Makefile, use *-am instead.
* Makefile.in: Rebuilt.
diff --git a/boehm-gc/Makefile.am b/boehm-gc/Makefile.am
index 4f214f6..cb383d5 100644
--- a/boehm-gc/Makefile.am
+++ b/boehm-gc/Makefile.am
@@ -55,7 +55,9 @@ $(all_objs) : config.h gc_priv.h gc_hdrs.h gc.h gc_mark.h
## FIXME: we shouldn't have to do this, but automake forces us to.
.s.lo:
- $(LTCOMPILE) -x assembler-with-cpp -c $<
+## We use -Wp,-P to strip #line directives. Irix `as' chokes on
+## these.
+ $(LTCOMPILE) -Wp,-P -x assembler-with-cpp -c $<
## We have our own definition of LTCOMPILE because we want to use our
## CFLAGS, not those passed in from the top level make.
diff --git a/boehm-gc/Makefile.in b/boehm-gc/Makefile.in
index 83ede9c..70ecbc4 100644
--- a/boehm-gc/Makefile.in
+++ b/boehm-gc/Makefile.in
@@ -487,7 +487,7 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
$(all_objs) : config.h gc_priv.h gc_hdrs.h gc.h gc_mark.h
.s.lo:
- $(LTCOMPILE) -x assembler-with-cpp -c $<
+ $(LTCOMPILE) -Wp,-P -x assembler-with-cpp -c $<
# Multilib support.
.PHONY: all-multi mostlyclean-multi clean-multi distclean-multi \