summaryrefslogtreecommitdiffstats
path: root/lib/msun
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2015-12-01 22:20:04 +0000
committerbdrewery <bdrewery@FreeBSD.org>2015-12-01 22:20:04 +0000
commit5a962dd0c6413dda6134b0aee51e4e99a3f6d1c1 (patch)
tree776c9b339eb020689b024842cc56784cbe75e14d /lib/msun
parent7f302a6c3c76177ad445353041efa95658a26b63 (diff)
downloadFreeBSD-src-5a962dd0c6413dda6134b0aee51e4e99a3f6d1c1.zip
FreeBSD-src-5a962dd0c6413dda6134b0aee51e4e99a3f6d1c1.tar.gz
Don't override LIB*DIR variables from src.libnames.mk.
In some cases switch to the LIB*SRCDIR value. These recently were defined in r291327 and r291619. Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'lib/msun')
-rw-r--r--lib/msun/Makefile9
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/msun/Makefile b/lib/msun/Makefile
index eb826f5..e731a98 100644
--- a/lib/msun/Makefile
+++ b/lib/msun/Makefile
@@ -81,17 +81,16 @@ COMMON_SRCS= b_exp.c b_log.c b_tgamma.c \
w_cabs.c w_cabsf.c w_drem.c w_dremf.c
# Location of fpmath.h and _fpmath.h
-LIBCDIR= ${.CURDIR}/../libc
-.if exists(${LIBCDIR}/${MACHINE_ARCH})
+.if exists(${LIBCSRCDIR}/${MACHINE_ARCH})
LIBC_ARCH=${MACHINE_ARCH}
.else
LIBC_ARCH=${MACHINE_CPUARCH}
.endif
-CFLAGS+= -I${.CURDIR}/src -I${LIBCDIR}/include \
- -I${LIBCDIR}/${LIBC_ARCH}
+CFLAGS+= -I${.CURDIR}/src -I${LIBCSRCDIR}/include \
+ -I${LIBCSRCDIR}/${LIBC_ARCH}
SYM_MAPS+= ${.CURDIR}/Symbol.map
-VERSION_DEF= ${LIBCDIR}/Versions.def
+VERSION_DEF= ${LIBCSRCDIR}/Versions.def
SYMBOL_MAPS= ${SYM_MAPS}
# C99 long double functions
OpenPOWER on IntegriCloud