Author: kevans
Date: Sun Feb 11 20:06:36 2018
New Revision: 329136
URL: https://svnweb.freebsd.org/changeset/base/329136
Log:
MFC r324648: Rename top level Makefile.ficl to ficl.mk.
Added:
stable/11/sys/boot/ficl.mk
- copied unchanged from r329135, stable/11/sys/boot/Makefile.ficl
Deleted:
stable/11/sys/boot/Makefile.ficl
Modified:
stable/11/sys/boot/common/Makefile.inc
stable/11/sys/boot/efi/libefi/Makefile
stable/11/sys/boot/ficl/Makefile
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/boot/common/Makefile.inc
==============================================================================
--- stable/11/sys/boot/common/Makefile.inc Sun Feb 11 20:04:34 2018
(r329135)
+++ stable/11/sys/boot/common/Makefile.inc Sun Feb 11 20:06:36 2018
(r329136)
@@ -66,7 +66,7 @@ SRCS+= pnp.c
# Forth interpreter
.if defined(BOOT_FORTH)
SRCS+= interp_forth.c
-.include "${SRCTOP}/sys/boot/Makefile.ficl"
+.include "../ficl.mk"
.endif
.if defined(BOOT_PROMPT_123)
Modified: stable/11/sys/boot/efi/libefi/Makefile
==============================================================================
--- stable/11/sys/boot/efi/libefi/Makefile Sun Feb 11 20:04:34 2018
(r329135)
+++ stable/11/sys/boot/efi/libefi/Makefile Sun Feb 11 20:06:36 2018
(r329136)
@@ -4,7 +4,7 @@
.if ${MK_FORTH} != "no"
CFLAGS+= -DBOOT_FORTH
-.include "${.CURDIR}/../../Makefile.ficl"
+.include "../../ficl.mk"
.endif
LIB= efi
Copied: stable/11/sys/boot/ficl.mk (from r329135,
stable/11/sys/boot/Makefile.ficl)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/11/sys/boot/ficl.mk Sun Feb 11 20:06:36 2018 (r329136, copy
of r329135, stable/11/sys/boot/Makefile.ficl)
@@ -0,0 +1,43 @@
+# $FreeBSD$
+
+# Common flags to build FICL related files
+
+FICLDIR?= ${SRCTOP}/sys/boot/ficl
+
+.if ${MACHINE_CPUARCH} == "amd64" && defined(FICL32)
+FICL_CPUARCH= i386
+.elif ${MACHINE_ARCH} == "mips64" || ${MACHINE_ARCH} == "mips64el"
+FICL_CPUARCH= mips64
+.else
+FICL_CPUARCH= ${MACHINE_CPUARCH}
+.endif
+
+.PATH: ${FICLDIR} ${FICLDIR}/${FICL_CPUARCH}
+
+.if ${MACHINE_CPUARCH} == "amd64"
+.if defined(FICL32)
+CFLAGS+= -m32 -I.
+.else
+CFLAGS+= -fPIC
+.endif
+.endif
+
+.if ${MACHINE_ARCH} == "powerpc64"
+CFLAGS+= -m32 -mcpu=powerpc -I.
+.endif
+
+CFLAGS+= -I${FICLDIR} -I${FICLDIR}/${FICL_CPUARCH} \
+ -I${FICLDIR}/../common
+
+.if ${MACHINE_CPUARCH} == "amd64" && defined(FICL32)
+.if !exists(machine)
+${SRCS:M*.c:R:S/$/.o/g}: machine
+
+beforedepend ${OBJS}: machine
+.endif
+
+machine: .NOMETA
+ ln -sf ${.CURDIR}/../../i386/include machine
+
+CLEANFILES+= machine
+.endif
Modified: stable/11/sys/boot/ficl/Makefile
==============================================================================
--- stable/11/sys/boot/ficl/Makefile Sun Feb 11 20:04:34 2018
(r329135)
+++ stable/11/sys/boot/ficl/Makefile Sun Feb 11 20:06:36 2018
(r329136)
@@ -1,7 +1,7 @@
# $FreeBSD$
#
-.include "${.CURDIR}/../Makefile.ficl"
+.include "../ficl.mk"
BASE_SRCS= dict.c ficl.c fileaccess.c float.c loader.c math64.c \
prefix.c search.c stack.c tools.c vm.c words.c
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
