diff options
| -rw-r--r-- | asmrun/Makefile | 3 | ||||
| -rwxr-xr-x | configure | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/asmrun/Makefile b/asmrun/Makefile index af572734b..c9ae28d00 100644 --- a/asmrun/Makefile +++ b/asmrun/Makefile @@ -151,7 +151,8 @@ hppa.o: hppa.S .SUFFIXES: .S .d.o .p.o .S.o: - $(ASPP) $(ASPPFLAGS) -o $*.o $*.S + $(ASPP) $(ASPPFLAGS) -o $*.o $*.S || \ + { echo "If your assembler produced syntax errors, it is probably unhappy with the"; echo "preprocessor. Check your assembler, or try producing $*.o by hand."; exit 2; } .S.p.o: $(ASPP) $(ASPPFLAGS) $(ASPPPROFFLAGS) -o $*.p.o $*.S @@ -14,6 +14,7 @@ # $Id$ +configure_options=$* prefix=/usr/local bindir='' libdir='' @@ -101,6 +102,10 @@ cd config/auto-aux rm -f s.h m.h Makefile touch s.h m.h Makefile +# Write options to Makefile + +echo "# generated by ./configure $configure_options" >> Makefile + # Where to install echo "PREFIX=$prefix" >> Makefile @@ -426,7 +431,8 @@ case "$arch,$model,$system" in *) asppflags='-P -DSYS_$(SYSTEM)';; esac;; i386,*,solaris) case "$cc" in - gcc*) aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';; + # Intel/solaris assembler doesn't like GNU cpp output + # gcc*) aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';; *) asppflags='-P -DSYS_$(SYSTEM)';; esac;; i386,*,*) aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';; |