diff options
| author | ngie <ngie@FreeBSD.org> | 2017-05-30 04:11:12 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2017-05-30 04:11:12 +0000 |
| commit | 96dc1cf1ed7b32083e3c2518b615049a51e28805 (patch) | |
| tree | cc073c28e12eab20ba91fc4b06400c1131b8d67d /sys/modules/linux/Makefile | |
| parent | 61642a6713ab173381f65410feaddc6c99f97b54 (diff) | |
| download | FreeBSD-src-96dc1cf1ed7b32083e3c2518b615049a51e28805.zip FreeBSD-src-96dc1cf1ed7b32083e3c2518b615049a51e28805.tar.gz | |
MFC r314651,r318439,r318440:
r314651:
sys/modules: normalize .CURDIR-relative paths to SRCTOP
This simplifies make output/logic
Tested with: `cd sys/modules; make ALL_MODULES=` on amd64
r318439:
Normalize .PATH on SRCTOP
This will help Jenkins dedupe 9 warnings between the static build and
the module build of ipsec(4).
Missed in SRCTOP conversion in r314651.
MFC with: r314651
r318440:
Normalize SYSDIR on SRCTOP instead of .CURDIR
This is being done to simplify pathing for CFLAGS and source files.
Diffstat (limited to 'sys/modules/linux/Makefile')
| -rw-r--r-- | sys/modules/linux/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile index d37fcf5..00d1de7 100644 --- a/sys/modules/linux/Makefile +++ b/sys/modules/linux/Makefile @@ -5,7 +5,7 @@ SFX= 32 CFLAGS+=-DCOMPAT_FREEBSD32 -DCOMPAT_LINUX32 .endif -.PATH: ${.CURDIR}/../../compat/linux ${.CURDIR}/../../${MACHINE_CPUARCH}/linux${SFX} +.PATH: ${SRCTOP}/sys/compat/linux ${SRCTOP}/sys/${MACHINE_CPUARCH}/linux${SFX} VDSO= linux${SFX}_vdso @@ -52,7 +52,7 @@ linux${SFX}_locore.o: linux${SFX}_assym.h assym.s ${CC} -x assembler-with-cpp -DLOCORE -m32 -shared -s \ -pipe -I. -I${SYSDIR} -Werror -Wall -fno-common -nostdinc -nostdlib \ -fno-omit-frame-pointer -fPIC \ - -Wl,-T${.CURDIR}/../../${MACHINE_CPUARCH}/linux${SFX}/${VDSO}.lds.s \ + -Wl,-T${SRCTOP}/sys/${MACHINE_CPUARCH}/linux${SFX}/${VDSO}.lds.s \ -Wl,-soname=${VDSO}.so.1,--eh-frame-hdr,-warn-common \ ${.IMPSRC} -o ${.TARGET} |
