aboutsummaryrefslogtreecommitdiffstats
path: root/Mk
diff options
context:
space:
mode:
authorswills <swills@FreeBSD.org>2018-02-06 22:26:41 +0800
committerswills <swills@FreeBSD.org>2018-02-06 22:26:41 +0800
commit5fc6309292ec601260737bb760207e247dc1c0c8 (patch)
tree46639791eba2b05be638dbf33964951393efa8e3 /Mk
parent33cc66eabead42d1a8bcea49ba5f19bc263cf33e (diff)
downloadfreebsd-ports-gnome-5fc6309292ec601260737bb760207e247dc1c0c8.tar.gz
freebsd-ports-gnome-5fc6309292ec601260737bb760207e247dc1c0c8.tar.zst
freebsd-ports-gnome-5fc6309292ec601260737bb760207e247dc1c0c8.zip
Changes from BZ PR 224217 plus minor changes to fix base/gcc fetch
Diffstat (limited to 'Mk')
-rw-r--r--Mk/bsd.port.mk11
1 files changed, 9 insertions, 2 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 6e64bfba420f..66de0595a4b9 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1097,10 +1097,17 @@ IGNORE= CROSS_SYSROOT should be defined
HOSTCC:= ${CC}
HOSTCXX:= ${CXX}
.endif
+.if !defined(CC_FOR_BUILD)
+CC_FOR_BUILD:= ${HOSTCC}
+CXX_FOR_BUILD:= ${HOSTCXX}
+.endif
+CONFIGURE_ENV+= HOSTCC="${HOSTCC}" HOSTCXX="${HOSTCXX}" CC_FOR_BUILD="${CC_FOR_BUILD}" CXX_FOR_BUILD="${CXX_FOR_BUILD}"
+
CC= ${XCC}
CXX= ${XCXX}
CFLAGS+= --sysroot=${CROSS_SYSROOT} -isystem ${CROSS_SYSROOT}/usr/include
-CXXFLAGS+= --sysroot=${CROSS_SYSROOT} -isystem ${CROSS_SYSROOT}/usr/include/c++/v1 -nostdinc++
+CXXFLAGS+= --sysroot=${CROSS_SYSROOT} -isystem ${CROSS_SYSROOT}/usr/include -isystem ${CROSS_SYSROOT}/usr/include/c++/v1 -nostdinc++
+CPPFLAGS+= --sysroot=${CROSS_SYSROOT} -isystem ${CROSS_SYSROOT}/usr/include
LDFLAGS+= --sysroot=${CROSS_SYSROOT}
.for _tool in AS AR LD NM OBJCOPY RANLIB SIZE STRINGS
${_tool}= ${CROSS_BINUTILS_PREFIX}${tool:tl}
@@ -2584,7 +2591,7 @@ VALID_CATEGORIES+= accessibility afterstep arabic archivers astro audio \
tcl textproc tk \
ukrainian vietnamese windowmaker wayland www \
x11 x11-clocks x11-drivers x11-fm x11-fonts x11-servers x11-themes \
- x11-toolkits x11-wm xfce zope
+ x11-toolkits x11-wm xfce zope base
check-categories:
.for cat in ${CATEGORIES}