svn commit: r312455 - in head/lib/csu: aarch64 amd64 arm i386 mips powerpc powerpc64 riscv sparc64
Ngie Cooper
ngie at FreeBSD.org
Fri Jan 20 03:52:18 UTC 2017
Author: ngie
Date: Fri Jan 20 03:52:16 2017
New Revision: 312455
URL: https://svnweb.freebsd.org/changeset/base/312455
Log:
Use SRCTOP-relative paths and .CURDIR with :H instead of ".." specified paths
This implifies pathing in make/displayed output
MFC after: 3 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/lib/csu/aarch64/Makefile
head/lib/csu/amd64/Makefile
head/lib/csu/arm/Makefile
head/lib/csu/i386/Makefile
head/lib/csu/mips/Makefile
head/lib/csu/powerpc/Makefile
head/lib/csu/powerpc64/Makefile
head/lib/csu/riscv/Makefile
head/lib/csu/sparc64/Makefile
Modified: head/lib/csu/aarch64/Makefile
==============================================================================
--- head/lib/csu/aarch64/Makefile Fri Jan 20 03:34:59 2017 (r312454)
+++ head/lib/csu/aarch64/Makefile Fri Jan 20 03:52:16 2017 (r312455)
@@ -1,12 +1,12 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../common
+.PATH: ${.CURDIR:H}/common
SRCS= crt1.c crti.S crtn.S
OBJS= ${SRCS:N*.h:R:S/$/.o/g}
OBJS+= Scrt1.o gcrt1.o
-CFLAGS+= -I${.CURDIR}/../common \
- -I${.CURDIR}/../../libc/include
+CFLAGS+= -I${.CURDIR:H}/common \
+ -I${SRCTOP}/lib/libc/include
FILES= ${OBJS}
FILESMODE= ${LIBMODE}
Modified: head/lib/csu/amd64/Makefile
==============================================================================
--- head/lib/csu/amd64/Makefile Fri Jan 20 03:34:59 2017 (r312454)
+++ head/lib/csu/amd64/Makefile Fri Jan 20 03:52:16 2017 (r312455)
@@ -1,12 +1,12 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../common
+.PATH: ${.CURDIR:H}/common
SRCS= crt1.c crti.S crtn.S
OBJS= ${SRCS:N*.h:R:S/$/.o/g}
OBJS+= Scrt1.o gcrt1.o
-CFLAGS+= -I${.CURDIR}/../common \
- -I${.CURDIR}/../../libc/include
+CFLAGS+= -I${.CURDIR:H}/common \
+ -I${SRCTOP}/lib/libc/include
CFLAGS+= -fno-omit-frame-pointer
FILES= ${OBJS}
Modified: head/lib/csu/arm/Makefile
==============================================================================
--- head/lib/csu/arm/Makefile Fri Jan 20 03:34:59 2017 (r312454)
+++ head/lib/csu/arm/Makefile Fri Jan 20 03:52:16 2017 (r312455)
@@ -1,12 +1,12 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../common
+.PATH: ${.CURDIR:H}/common
SRCS= crt1.c crti.S crtn.S
OBJS= ${SRCS:N*.h:R:S/$/.o/g}
OBJS+= Scrt1.o gcrt1.o
-CFLAGS+= -I${.CURDIR}/../common \
- -I${.CURDIR}/../../libc/include
+CFLAGS+= -I${.CURDIR:H}/common \
+ -I${SRCTOP}/lib/libc/include
STATIC_CFLAGS+= -mlong-calls
FILES= ${OBJS}
Modified: head/lib/csu/i386/Makefile
==============================================================================
--- head/lib/csu/i386/Makefile Fri Jan 20 03:34:59 2017 (r312454)
+++ head/lib/csu/i386/Makefile Fri Jan 20 03:52:16 2017 (r312455)
@@ -1,12 +1,12 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../common
+.PATH: ${.CURDIR:H}/common
SRCS= crti.S crtn.S
OBJS= ${SRCS:N*.h:R:S/$/.o/g}
OBJS+= gcrt1.o crt1.o Scrt1.o
-CFLAGS+= -I${.CURDIR}/../common \
- -I${.CURDIR}/../../libc/include
+CFLAGS+= -I${.CURDIR:H}/common \
+ -I${SRCTOP}/lib/libc/include
FILES= ${OBJS}
FILESMODE= ${LIBMODE}
Modified: head/lib/csu/mips/Makefile
==============================================================================
--- head/lib/csu/mips/Makefile Fri Jan 20 03:34:59 2017 (r312454)
+++ head/lib/csu/mips/Makefile Fri Jan 20 03:52:16 2017 (r312455)
@@ -1,12 +1,12 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../common
+.PATH: ${.CURDIR:H}/common
SRCS= crt1.c crti.S crtn.S
OBJS= ${SRCS:N*.h:R:S/$/.o/g}
OBJS+= Scrt1.o gcrt1.o
-CFLAGS+= -I${.CURDIR}/../common \
- -I${.CURDIR}/../../libc/include
+CFLAGS+= -I${.CURDIR:H}/common \
+ -I${SRCTOP}/lib/libc/include
FILES= ${OBJS}
FILESMODE= ${LIBMODE}
Modified: head/lib/csu/powerpc/Makefile
==============================================================================
--- head/lib/csu/powerpc/Makefile Fri Jan 20 03:34:59 2017 (r312454)
+++ head/lib/csu/powerpc/Makefile Fri Jan 20 03:52:16 2017 (r312455)
@@ -1,12 +1,12 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../common
+.PATH: ${.CURDIR:H}/common
SRCS= crt1.c crti.S crtn.S
OBJS= ${SRCS:N*.h:R:S/$/.o/g}
OBJS+= Scrt1.o gcrt1.o
-CFLAGS+= -I${.CURDIR}/../common \
- -I${.CURDIR}/../../libc/include
+CFLAGS+= -I${.CURDIR:H}/common \
+ -I${SRCTOP}/lib/libc/include
FILES= ${OBJS}
FILESMODE= ${LIBMODE}
Modified: head/lib/csu/powerpc64/Makefile
==============================================================================
--- head/lib/csu/powerpc64/Makefile Fri Jan 20 03:34:59 2017 (r312454)
+++ head/lib/csu/powerpc64/Makefile Fri Jan 20 03:52:16 2017 (r312455)
@@ -1,12 +1,12 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../common
+.PATH: ${.CURDIR:H}/common
SRCS= crt1.c crti.S crtn.S
OBJS= ${SRCS:N*.h:R:S/$/.o/g}
OBJS+= Scrt1.o gcrt1.o
-CFLAGS+= -I${.CURDIR}/../common \
- -I${.CURDIR}/../../libc/include \
+CFLAGS+= -I${.CURDIR:H}/common \
+ -I${SRCTOP}/lib/libc/include \
-mlongcall
# XXX: See the log for r232932 as to why the above -mlongcall is needed. Since
Modified: head/lib/csu/riscv/Makefile
==============================================================================
--- head/lib/csu/riscv/Makefile Fri Jan 20 03:34:59 2017 (r312454)
+++ head/lib/csu/riscv/Makefile Fri Jan 20 03:52:16 2017 (r312455)
@@ -1,12 +1,12 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../common
+.PATH: ${.CURDIR:H}/common
SRCS= crt1.c crti.S crtn.S
OBJS= ${SRCS:N*.h:R:S/$/.o/g}
OBJS+= Scrt1.o gcrt1.o
-CFLAGS+= -I${.CURDIR}/../common \
- -I${.CURDIR}/../../libc/include
+CFLAGS+= -I${.CURDIR:H}/common \
+ -I${SRCTOP}/lib/libc/include
FILES= ${OBJS}
FILESMODE= ${LIBMODE}
Modified: head/lib/csu/sparc64/Makefile
==============================================================================
--- head/lib/csu/sparc64/Makefile Fri Jan 20 03:34:59 2017 (r312454)
+++ head/lib/csu/sparc64/Makefile Fri Jan 20 03:52:16 2017 (r312455)
@@ -1,11 +1,12 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../common
+.PATH: ${.CURDIR:H}/common
SRCS= crt1.c crti.S crtn.S
OBJS= ${SRCS:N*.h:R:S/$/.o/g}
OBJS+= Scrt1.o gcrt1.o
-CFLAGS+= -I${.CURDIR}/../common -I${.CURDIR}/../../libc/include
+CFLAGS+= -I${.CURDIR:H}/common \
+ -I${SRCTOP}/lib/libc/include
FILES= ${OBJS}
FILESMODE= ${LIBMODE}
More information about the svn-src-head
mailing list