summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorP. J. McDermott <pjm@nac.net>2013-04-22 12:58:33 (EDT)
committer P. J. McDermott <pjm@nac.net>2013-04-22 12:58:33 (EDT)
commitcd880cc57064b21f71a75128dcac617456c9add9 (patch)
tree7fa88b2965bebe73c18344dfed5e8976083badca
parent3c56900ef40faeaa046c707b47faaecf6549dea5 (diff)
build: Clean up setting of *dir macros.
-rwxr-xr-xbuild24
1 files changed, 14 insertions, 10 deletions
diff --git a/build b/build
index 00850a1..190fc26 100755
--- a/build
+++ b/build
@@ -44,12 +44,14 @@ configure:
touch $@
build: configure
+ libsubdir="/usr/lib/$(OPK_HOST_ARCH)/gcc-$(BASE_VERSION)" && \
oh-autobuild -B gcc-build -T bootstrap-lean -- -j $${JOBS:-1} \
- libsubdir=/usr/lib/$(OPK_HOST_ARCH)/gcc-$(BASE_VERSION) \
- libexecsubdir=/usr/lib/$(OPK_HOST_ARCH)/gcc-$(BASE_VERSION) \
- libsubincludedir=/usr/lib/$(OPK_HOST_ARCH)/gcc-$(BASE_VERSION) \
- fincludedir=/usr/lib/$(OPK_HOST_ARCH)/gcc-$(BASE_VERSION)/finclude \
- toolexeclibdir=/usr/lib/$(OPK_HOST_ARCH) MULTIOSDIR=
+ libsubdir="$${libsubdir}" \
+ libexecsubdir="$${libsubdir}" \
+ libsubincludedir="$${libsubdir}" \
+ fincludedir="$${libsubdir}/finclude" \
+ toolexeclibdir=/usr/lib/$(OPK_HOST_ARCH) \
+ MULTIOSDIR=
touch $@
install: build
@@ -62,14 +64,16 @@ install: build
# is specified.
# See also: <http://gcc.gnu.org/ml/gcc/2013-04/msg00171.html>.
# TODO: Replace $(OPK_HOST_ARCH) with the target arch.
+ libsubdir="/usr/lib/$(OPK_HOST_ARCH)/gcc-$(BASE_VERSION)" && \
oh-autoinstall -B gcc-build -T install -- \
gxx_include_dir=/usr/include/c++-4.7 \
host_installdir=/usr/include/$(OPK_HOST_ARCH)/c++-4.7/bits \
- libsubdir=/usr/lib/$(OPK_HOST_ARCH)/gcc-$(BASE_VERSION) \
- libexecsubdir=/usr/lib/$(OPK_HOST_ARCH)/gcc-$(BASE_VERSION) \
- libsubincludedir=/usr/lib/$(OPK_HOST_ARCH)/gcc-$(BASE_VERSION) \
- fincludedir=/usr/lib/$(OPK_HOST_ARCH)/gcc-$(BASE_VERSION)/finclude \
- toolexeclibdir=/usr/lib/$(OPK_HOST_ARCH) MULTIOSDIR=
+ libsubdir="$${libsubdir}" \
+ libexecsubdir="$${libsubdir}" \
+ libsubincludedir="$${libsubdir}" \
+ fincludedir="$${libsubdir}/finclude" \
+ toolexeclibdir=/usr/lib/$(OPK_HOST_ARCH) \
+ MULTIOSDIR=
# Change the target architecture prefix of files in /usr/bin.
rm -f dest/usr/bin/*-gcc-$(BASE_VERSION).*
for f in c++ g++ gcc gcc-ar gcc-nm gcc-ranlib; do \