diff options
| author | emaste <emaste@FreeBSD.org> | 2016-01-01 15:30:11 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2016-01-01 15:30:11 +0000 |
| commit | 78ef3d15998f2266e455b08a1b01fb9ff8926511 (patch) | |
| tree | 8bae0939c7a3e1e18efe3306e475e11c544fdc33 /lib/libstand | |
| parent | 4650ba515687ea9f157c4707929fab601526828c (diff) | |
| download | FreeBSD-src-78ef3d15998f2266e455b08a1b01fb9ff8926511.zip FreeBSD-src-78ef3d15998f2266e455b08a1b01fb9ff8926511.tar.gz | |
Reduce libstand Makefile duplication
libstand is built in three places (lib/libstand, sys/boot/libstand32,
and sys/boot/userboot/libstand). Reduce Makefile duplication by
.including libstand/Makefile from sys/boot/libstand32/Makefile.
sys/boot/userboot/libstand/Makefile will be addressed later, as it
contains additional differences yet to be handled.
This change also switches libstand32 to use the new uuid_from_string
and uuid_to_string, which was not included in r292473.
Reviewed by: jhb
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D4747
Diffstat (limited to 'lib/libstand')
| -rw-r--r-- | lib/libstand/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/libstand/Makefile b/lib/libstand/Makefile index 3126c1c..9d1f6bc 100644 --- a/lib/libstand/Makefile +++ b/lib/libstand/Makefile @@ -11,13 +11,14 @@ MK_SSP= no .include <src.opts.mk> -LIBSTAND_SRC= ${.CURDIR} +LIBSTAND_SRC?= ${.CURDIR} +LIBSTAND_CPUARCH?=${MACHINE_CPUARCH} LIBC_SRC= ${LIBSTAND_SRC}/../libc LIB= stand NO_PIC= INCS= stand.h -MAN= libstand.3 +MAN?= libstand.3 WARNS?= 0 @@ -78,7 +79,7 @@ SRCS+= syncicache.c SRCS+= uuid_create_nil.c uuid_equal.c uuid_from_string.c uuid_is_nil.c uuid_to_string.c # _setjmp/_longjmp -.PATH: ${LIBSTAND_SRC}/${MACHINE_CPUARCH} +.PATH: ${LIBSTAND_SRC}/${LIBSTAND_CPUARCH} SRCS+= _setjmp.S # decompression functionality from libbz2 |
