summaryrefslogtreecommitdiff
path: root/Makefile.cross
diff options
context:
space:
mode:
authorDale Rahn <drahn@cvs.openbsd.org>2010-07-09 17:36:09 +0000
committerDale Rahn <drahn@cvs.openbsd.org>2010-07-09 17:36:09 +0000
commit9d540184df384fe95b80b67c1678b2adeac7fcea (patch)
tree139c99ac5a0d64c0cc7be8b91a2a39f0fb1f08e9 /Makefile.cross
parent9b4939a135e7439d02025abc3fae443f6b34a436 (diff)
Fix cross build problem with cpp, marex pointed out that it wasn't committed.
Diffstat (limited to 'Makefile.cross')
-rw-r--r--Makefile.cross5
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile.cross b/Makefile.cross
index 7bf97c3b23c..5da328b3268 100644
--- a/Makefile.cross
+++ b/Makefile.cross
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.cross,v 1.31 2010/06/01 04:33:40 drahn Exp $
+# $OpenBSD: Makefile.cross,v 1.32 2010/07/09 17:36:08 drahn Exp $
cross-tools: cross-includes cross-binutils cross-gcc cross-lib
cross-distrib: cross-tools cross-bin cross-share cross-sys cross-etc-root-var
@@ -277,6 +277,7 @@ ${CROSSGCC}: ${CROSSBINUTILS}
ln -sf ${TARGET_CANON}-c++ ${CROSSDIR}/usr/${TARGET_CANON}/bin/c++
rm -f ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cpp
sed -e 's#/usr/libexec/cpp#${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-libexeccpp#' \
+ -e 's/@GNUC@//' \
-e 's#/usr/include#${CROSSDIR}/usr/include#' \
-e 's/@dollaropt@//' \
${.CURDIR}/usr.bin/cpp/cpp.sh > ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cpp
@@ -303,6 +304,7 @@ ${CROSSGCC}: ${CROSSBINUTILS}
ln -sf ${TARGET_CANON}-c++ ${CROSSDIR}/usr/${TARGET_CANON}/bin/c++
rm -f ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cpp
sed -e 's#/usr/libexec/cpp#${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-libexeccpp#' \
+ -e 's/@GNUC@/-D__GNUC__/' \
-e 's#/usr/include#${CROSSDIR}/usr/include#' \
-e 's/@dollaropt@//' \
${.CURDIR}/usr.bin/cpp/cpp.sh > ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cpp
@@ -329,6 +331,7 @@ ${CROSSGCC}: ${CROSSBINUTILS}
mv -f ${CROSSDIR}/usr/bin/cpp ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-libexeccpp
rm -f ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cpp
sed -e 's#/usr/libexec/cpp#${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-libexeccpp#' \
+ -e 's/@GNUC@/-D__GNUC__/' \
-e 's#/usr/include#${CROSSDIR}/usr/include#' \
-e 's/@dollaropt@/-$$/' ${.CURDIR}/usr.bin/cpp/cpp.sh > \
${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cpp