diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2013-10-13 00:29:14 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2013-10-13 00:29:14 +0000 |
| commit | aab5fee0721846740415f201b41c920033a49303 (patch) | |
| tree | bdebee0c2d5e9f65026aaebcb1e0e507bffe12c8 | |
| parent | c8191bc69e371d47c087ae124ff863de342a479b (diff) | |
| download | src-test2-aab5fee0721846740415f201b41c920033a49303.tar.gz src-test2-aab5fee0721846740415f201b41c920033a49303.zip | |
We need an extra -I from lib/msun
and we need to supress dependency on it - cyclic.
Notes
Notes:
svn path=/projects/bmake/; revision=256422
| -rw-r--r-- | lib/libc/Makefile | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/libc/Makefile b/lib/libc/Makefile index ba4dd0ae16c3..39d820264e3d 100644 --- a/lib/libc/Makefile +++ b/lib/libc/Makefile @@ -158,7 +158,15 @@ CFLAGS+= -I${.CURDIR:H}/libutil # Same issue with libm MSUN_ARCH_SUBDIR != ${MAKE} -B -C ${.CURDIR:H}/msun -V ARCH_SUBDIR # unfortunately msun/src contains both private and public headers -CFLAGS+= -I${.CURDIR:H}/msun/${MSUN_ARCH_SUBDIR} -I${.CURDIR:H}/msun/src +CFLAGS+= -I${.CURDIR:H}/msun/${MSUN_ARCH_SUBDIR} +.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" +CFLAGS+= -I${.CURDIR:H}/msun/x86 +.endif +CFLAGS+= -I${.CURDIR:H}/msun/src +# and we do not want to record a dependency on msun +.if ${.MAKE.LEVEL} > 0 +GENDIRDEPS_FILTER+= N${RELDIR:H}/msun +.endif .endif # Disable warnings in contributed sources. |