diff options
| author | Warner Losh <imp@FreeBSD.org> | 2017-11-04 03:01:52 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2017-11-04 03:01:52 +0000 |
| commit | cc088d92e23589709877888eaaaff2dec399e65d (patch) | |
| tree | e8c7c73688e3fa3a4376f286cf01b8f46bc855e6 /sys/boot | |
| parent | 2caf91812139c55a5cb88ba103ef06843ad522a3 (diff) | |
Notes
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/defs.mk | 1 | ||||
| -rw-r--r-- | sys/boot/libsa/Makefile | 4 | ||||
| -rw-r--r-- | sys/boot/libsa32/Makefile | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/sys/boot/defs.mk b/sys/boot/defs.mk index 942ad381732c..e0bd3023d91f 100644 --- a/sys/boot/defs.mk +++ b/sys/boot/defs.mk @@ -84,6 +84,7 @@ CFLAGS+= -DLOADER_MBR_SUPPORT .if ${LOADER_GELI_SUPPORT:Uyes} == "yes" CFLAGS+= -DLOADER_GELI_SUPPORT .endif +.endif _ILINKS=machine .if ${MACHINE} != ${MACHINE_CPUARCH} && ${MACHINE} != "arm64" diff --git a/sys/boot/libsa/Makefile b/sys/boot/libsa/Makefile index daf530d9f123..8ea42e389001 100644 --- a/sys/boot/libsa/Makefile +++ b/sys/boot/libsa/Makefile @@ -14,7 +14,7 @@ MK_SSP= no .include "../Makefile.inc" INTERNALLIB= -LIBSTAND_CPUARCH?=${MACHINE_CPUARCH} +LIBSA_CPUARCH?=${MACHINE_CPUARCH} LIBC_SRC= ${SRCTOP}/lib/libc LIB?= sa @@ -83,7 +83,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: ${SASRC}/${LIBSTAND_CPUARCH} +.PATH: ${SASRC}/${LIBSA_CPUARCH} SRCS+= _setjmp.S # decompression functionality from libbz2 diff --git a/sys/boot/libsa32/Makefile b/sys/boot/libsa32/Makefile index f62b6d1d86ea..12ffcbb6da5b 100644 --- a/sys/boot/libsa32/Makefile +++ b/sys/boot/libsa32/Makefile @@ -4,9 +4,9 @@ LIB=sa32 .if ${MACHINE_CPUARCH} == "amd64" -LIBSTAND_CPUARCH=i386 +LIBSA_CPUARCH=i386 .else -LIBSTAND_CPUARCH=${MACHINE_CPUARCH} +LIBSA_CPUARCH=${MACHINE_CPUARCH} .endif .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "powerpc64" |