diff options
| author | Renato Botelho <renato@netgate.com> | 2017-02-23 06:28:41 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2017-02-23 06:28:41 -0300 |
| commit | 82ceeb2ea625cd9bff60f2863b9a0830f55b7905 (patch) | |
| tree | 263ca9347bf664a4489743f9302e699ce14de1df /lib/csu | |
| parent | 4a05f5440acda223e6a0ec5157bc32ecc0f09ff9 (diff) | |
| parent | d20dd8b36e7a565be7bfbb22aade51c8ffd753e9 (diff) | |
| download | FreeBSD-src-82ceeb2ea625cd9bff60f2863b9a0830f55b7905.zip FreeBSD-src-82ceeb2ea625cd9bff60f2863b9a0830f55b7905.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into develdevel
Diffstat (limited to 'lib/csu')
| -rw-r--r-- | lib/csu/amd64/Makefile | 6 | ||||
| -rw-r--r-- | lib/csu/arm/Makefile | 6 | ||||
| -rw-r--r-- | lib/csu/i386-elf/Makefile | 6 | ||||
| -rw-r--r-- | lib/csu/mips/Makefile | 6 | ||||
| -rw-r--r-- | lib/csu/powerpc/Makefile | 6 | ||||
| -rw-r--r-- | lib/csu/powerpc64/Makefile | 6 | ||||
| -rw-r--r-- | lib/csu/sparc64/Makefile | 5 |
7 files changed, 21 insertions, 20 deletions
diff --git a/lib/csu/amd64/Makefile b/lib/csu/amd64/Makefile index 80d14a7..7341aec 100644 --- a/lib/csu/amd64/Makefile +++ b/lib/csu/amd64/Makefile @@ -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 all: ${OBJS} diff --git a/lib/csu/arm/Makefile b/lib/csu/arm/Makefile index bf4c7b1..ca21fdb 100644 --- a/lib/csu/arm/Makefile +++ b/lib/csu/arm/Makefile @@ -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 all: ${OBJS} diff --git a/lib/csu/i386-elf/Makefile b/lib/csu/i386-elf/Makefile index f26db15..dd387b9 100644 --- a/lib/csu/i386-elf/Makefile +++ b/lib/csu/i386-elf/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../common +.PATH: ${.CURDIR:H}/common SRCS= crti.S crtn.S FILES= ${SRCS:N*.h:R:S/$/.o/g} gcrt1.o crt1.o Scrt1.o @@ -8,8 +8,8 @@ FILESOWN= ${LIBOWN} FILESGRP= ${LIBGRP} FILESMODE= ${LIBMODE} FILESDIR= ${LIBDIR} -CFLAGS+= -I${.CURDIR}/../common \ - -I${.CURDIR}/../../libc/include +CFLAGS+= -I${.CURDIR:H}/common \ + -I${SRCTOP}/lib/libc/include CLEANFILES= ${FILES} crt1_c.o crt1_s.o gcrt1_c.o Scrt1_c.o CLEANFILES+= crt1_c.s gcrt1_c.s Scrt1_c.s diff --git a/lib/csu/mips/Makefile b/lib/csu/mips/Makefile index bf4c7b1..ca21fdb 100644 --- a/lib/csu/mips/Makefile +++ b/lib/csu/mips/Makefile @@ -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 all: ${OBJS} diff --git a/lib/csu/powerpc/Makefile b/lib/csu/powerpc/Makefile index bf4c7b1..ca21fdb 100644 --- a/lib/csu/powerpc/Makefile +++ b/lib/csu/powerpc/Makefile @@ -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 all: ${OBJS} diff --git a/lib/csu/powerpc64/Makefile b/lib/csu/powerpc64/Makefile index 123391e..b579db0 100644 --- a/lib/csu/powerpc64/Makefile +++ b/lib/csu/powerpc64/Makefile @@ -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 all: ${OBJS} diff --git a/lib/csu/sparc64/Makefile b/lib/csu/sparc64/Makefile index 7f8dd7a..6561997 100644 --- a/lib/csu/sparc64/Makefile +++ b/lib/csu/sparc64/Makefile @@ -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 all: ${OBJS} |
