Browse Source

This patch, based on a patch from Stefan Allius, lets us pick an
appropriate awk implementation at compile time, so we can again
compile on Solaris and whatnot.
-Erik

Eric Andersen 23 years ago
parent
commit
8eecdc9257
2 changed files with 5 additions and 2 deletions
  1. 3 0
      Rules.mak
  2. 2 2
      libc/sysdeps/linux/common/Makefile

+ 3 - 0
Rules.mak

@@ -37,6 +37,9 @@ UCLIBC_LDSO:=ld-uClibc.so.$(MAJOR_VERSION)
 LIBC:=$(TOPDIR)libc/libc.a
 LIBGCC:=$(shell $(CC) $(LIBGCC_CFLAGS) -print-libgcc-file-name)
 
+# check if we have nawk, otherwise user awk
+AWK:= ${shell if [ -x /usr/bin/nawk ]; then echo "/usr/bin/nawk"; else echo "/usr/bin/awk"; fi}
+
 NATIVE_ARCH:= ${shell uname -m | sed \
 		-e 's/i.86/i386/' \
 		-e 's/sparc.*/sparc/' \

+ 2 - 2
libc/sysdeps/linux/common/Makefile

@@ -64,7 +64,7 @@ initfini.s: initfini.c
 	$(CC) $(SAFECFLAGS) -I$(TOPDIR)include -c initfini.c -S -o initfini.s
 
 crti.S crtn.S: initfini.s $(TOPDIR)/extra/scripts/initfini.awk
-	$(TOPDIR)/extra/scripts/initfini.awk initfini.s
+	$(AWK) -f $(TOPDIR)extra/scripts/initfini.awk initfini.s
 
 crti.o: crti.S
 	$(CC) $(SAFECFLAGS) -c crti.S -o crti.o
@@ -81,5 +81,5 @@ $(TOPDIR)lib/crtn.o: crtn.o
 	cp crtn.o $(TOPDIR)lib/
 
 clean:
-	rm -f *.[oa] *~ core crti.* crtn.* initfini.s
+	rm -f *.[oa] *~ core crt[in].* initfini.s