aboutsummaryrefslogtreecommitdiffstats
path: root/Mk
diff options
context:
space:
mode:
authorbapt <bapt@FreeBSD.org>2014-06-12 05:00:50 +0800
committerbapt <bapt@FreeBSD.org>2014-06-12 05:00:50 +0800
commitf25fce71bd7288ad59a29fb226488c8f06d2aae1 (patch)
tree90a39c649ad1b41d20468a769a39983644d992bf /Mk
parent11079d5a3c88726f097edb13ed7d71a2a710091e (diff)
downloadfreebsd-ports-gnome-f25fce71bd7288ad59a29fb226488c8f06d2aae1.tar.gz
freebsd-ports-gnome-f25fce71bd7288ad59a29fb226488c8f06d2aae1.tar.zst
freebsd-ports-gnome-f25fce71bd7288ad59a29fb226488c8f06d2aae1.zip
Define X_SYSROOT to avoid duplicating code too much
Define PKG_CONFIG_SYSROOT_DIR for cross building pkgconf files
Diffstat (limited to 'Mk')
-rw-r--r--Mk/bsd.port.mk14
1 files changed, 7 insertions, 7 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index a21f6e80a469..f92146273b15 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1143,17 +1143,17 @@ HCC:= ${CC}
HCXX:= ${CXX}
.endif
.if !exists(/usr/${X_BUILD_FOR}/usr/bin/cc)
-CC= ${LOCALBASE}/${X_BUILD_FOR}/usr/bin/cc
-CXX= ${LOCALBASE}/${X_BUILD_FOR}/usr/bin/c++
-PKG_ENV+= ABI_FILE=${LOCALBASE}/${X_BUILD_FOR}/usr/lib/crt1.o
+X_SYSROOT= ${LOCALBASE}/${X_BUILD_FOR}
.else
-CC= /usr/${X_BUILD_FOR}/usr/bin/cc
-CXX= /usr/${X_BUILD_FOR}/usr/bin/c++
-PKG_ENV+= ABI_FILE=/usr/${X_BUILD_FOR}/usr/lib/crt1.o
+X_SYSROOT= /usr/${X_BUILD_FOR}
.endif
+CC= ${X_SYSROOT}/usr/bin/cc
+CXX= ${X_SYSROOT}/usr/bin/c++
+PKG_ENV+= ABI_FILE=${X_SYSROOT}/usr/lib/crt1.o
NM= ${X_BUILD_FOR}-nm
STRIP_CMD= ${X_BUILD_FOR}-strip
-MAKE_ENV+= NM=${NM} STRIPBIN=${X_BUILD_FOR}-strip
+MAKE_ENV+= NM=${NM} STRIPBIN=${X_BUILD_FOR}-strip PKG_CONFIG_SYSROOT_DIR="${X_SYSROOT}"
+CONFIGURE_ENV+= PKG_CONFIG_SYSROOT_DIR="${X_SYSROOT}"
# only bmake support the below
STRIPBIN= ${STRIP_CMD}
.export.env STRIPBIN