Make override of nm consistent across all platforms and sort the overrides.
Reminded by: obrien
This commit is contained in:
parent
9c2de1cd14
commit
43aba0eadb
@ -34,8 +34,9 @@ S= ../../..
|
||||
.endif
|
||||
M= ${MACHINE_ARCH}
|
||||
|
||||
SIZE?= size
|
||||
NM?= nm
|
||||
OBJCOPY?= objcopy
|
||||
SIZE?= size
|
||||
|
||||
COPTFLAGS?=-O -pipe
|
||||
.if !defined(NO_CPU_COPTFLAGS)
|
||||
@ -174,7 +175,7 @@ hack.So: Makefile
|
||||
./assym.s: assym.s
|
||||
|
||||
assym.s: $S/kern/genassym.sh genassym.o
|
||||
OBJFORMAT=elf sh $S/kern/genassym.sh genassym.o > ${.TARGET}
|
||||
NM=${NM} OBJFORMAT=elf sh $S/kern/genassym.sh genassym.o > ${.TARGET}
|
||||
|
||||
genassym.o: $S/$M/$M/genassym.c
|
||||
${CC} -c ${CFLAGS} -elf $S/$M/$M/genassym.c
|
||||
|
@ -34,8 +34,9 @@ S= ../../..
|
||||
.endif
|
||||
M= ${MACHINE_ARCH}
|
||||
|
||||
SIZE?= size
|
||||
NM?= nm
|
||||
OBJCOPY?= objcopy
|
||||
SIZE?= size
|
||||
|
||||
COPTFLAGS?=-O -pipe
|
||||
.if !defined(NO_CPU_COPTFLAGS)
|
||||
@ -177,7 +178,7 @@ hack.So: Makefile
|
||||
./assym.s: assym.s
|
||||
|
||||
assym.s: $S/kern/genassym.sh genassym.o
|
||||
OBJFORMAT=elf sh $S/kern/genassym.sh genassym.o > ${.TARGET}
|
||||
NM=${NM} OBJFORMAT=elf sh $S/kern/genassym.sh genassym.o > ${.TARGET}
|
||||
|
||||
genassym.o: $S/$M/$M/genassym.c
|
||||
${CC} -c ${CFLAGS} -elf $S/$M/$M/genassym.c
|
||||
|
@ -44,8 +44,9 @@ S= ../../..
|
||||
.endif
|
||||
M= ${MACHINE_ARCH}
|
||||
|
||||
SIZE?= size
|
||||
NM?= nm
|
||||
OBJCOPY?= objcopy
|
||||
SIZE?= size
|
||||
|
||||
COPTFLAGS?=-O -pipe
|
||||
.if !defined(NO_CPU_COPTFLAGS)
|
||||
|
@ -36,8 +36,9 @@ S= ../../..
|
||||
.endif
|
||||
M= ${MACHINE_ARCH}
|
||||
|
||||
SIZE?= size
|
||||
NM?= nm
|
||||
OBJCOPY?= objcopy
|
||||
SIZE?= size
|
||||
|
||||
COPTFLAGS?=-O -pipe
|
||||
.if !defined(NO_CPU_COPTFLAGS)
|
||||
@ -179,7 +180,7 @@ hack.So: Makefile
|
||||
./assym.s: assym.s
|
||||
|
||||
assym.s: $S/kern/genassym.sh genassym.o
|
||||
OBJFORMAT=elf sh $S/kern/genassym.sh genassym.o > ${.TARGET}
|
||||
NM=${NM} OBJFORMAT=elf sh $S/kern/genassym.sh genassym.o > ${.TARGET}
|
||||
|
||||
genassym.o: $S/$M/$M/genassym.c
|
||||
${CC} -c ${CFLAGS} -elf $S/$M/$M/genassym.c
|
||||
|
@ -37,9 +37,9 @@ S= ../../..
|
||||
.endif
|
||||
M= ${MACHINE_ARCH}
|
||||
|
||||
SIZE?= size
|
||||
OBJCOPY?= objcopy
|
||||
NM?= nm
|
||||
OBJCOPY?= objcopy
|
||||
SIZE?= size
|
||||
|
||||
COPTFLAGS?=-O -pipe
|
||||
.if !defined(NO_CPU_COPTFLAGS)
|
||||
|
@ -49,8 +49,9 @@ S= ../../..
|
||||
.endif
|
||||
M= ${MACHINE_ARCH}
|
||||
|
||||
SIZE?= size
|
||||
NM?= nm
|
||||
OBJCOPY?= objcopy
|
||||
SIZE?= size
|
||||
|
||||
COPTFLAGS?=-O -pipe
|
||||
.if !defined(NO_CPU_COPTFLAGS)
|
||||
@ -193,7 +194,7 @@ hack.So: Makefile
|
||||
./assym.s: assym.s
|
||||
|
||||
assym.s: $S/kern/genassym.sh genassym.o
|
||||
OBJFORMAT=elf NM=${NM} sh $S/kern/genassym.sh genassym.o > ${.TARGET}
|
||||
NM=${NM} OBJFORMAT=elf sh $S/kern/genassym.sh genassym.o > ${.TARGET}
|
||||
|
||||
genassym.o: $S/$M/$M/genassym.c
|
||||
${CC} -c ${CFLAGS} -elf $S/$M/$M/genassym.c
|
||||
|
Loading…
Reference in New Issue
Block a user