summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2011-02-11 04:03:39 +0000
committerimp <imp@FreeBSD.org>2011-02-11 04:03:39 +0000
commit9d26fecad6d2e2ed112caf19320e8f94ead5993a (patch)
tree4807fb5824beadbb46a2daaa7d5635e4c1346b4c
parenta5adf9c2c66af432cfdd5a146c805de2a39849bc (diff)
downloadFreeBSD-src-9d26fecad6d2e2ed112caf19320e8f94ead5993a.zip
FreeBSD-src-9d26fecad6d2e2ed112caf19320e8f94ead5993a.tar.gz
Hmmm, specifying TARGET and TARGET_ARCH in the environment doesn't
seem to work when building xdev anymore (most likely my changes lately moving the TARGET guessing stuff to Makefile from Makefile.inc1, but I really don't grok why). Fix make xdev by putting them on the command line. This will work either way while I try to figure it out.
-rw-r--r--Makefile.inc112
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index 37fde6f..28435d5 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1439,13 +1439,13 @@ XDEV_CPUTYPE?=${TARGET_CPUTYPE}
NOFUN=-DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \
-DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_PROFILE \
- -DWITHOUT_KERBEROS -DWITHOUT_RESCUE -DNO_WARNS
-
-XDDIR=${XDEV}-freebsd
-XDTP=/usr/${XDDIR}
-CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR} \
+ -DWITHOUT_KERBEROS -DWITHOUT_RESCUE -DNO_WARNS \
TARGET=${XDEV} TARGET_ARCH=${XDEV_ARCH} \
CPUTYPE=${XDEV_CPUTYPE}
+
+XDDIR=${XDEV_ARCH}-freebsd
+XDTP=/usr/${XDDIR}
+CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR}
CDENV= ${CDBENV} \
_SHLIBDIRPREFIX=${XDTP} \
TOOLS_PREFIX=${XDTP}
@@ -1467,7 +1467,7 @@ xdev: xdev-build xdev-install
xdev-build: _xb-build-tools _xb-cross-tools
_xb-build-tools:
- ${_+_}cd ${.CURDIR}; \
+ ${_+_}@cd ${.CURDIR}; \
${CDBENV} ${MAKE} -f Makefile.inc1 ${NOFUN} build-tools
_xb-cross-tools:
OpenPOWER on IntegriCloud