summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McDermott <patrick.mcdermott@libiquity.com>2019-05-12 16:08:10 (EDT)
committer Patrick McDermott <patrick.mcdermott@libiquity.com>2019-05-13 11:47:44 (EDT)
commita8671f48c972ad0e7ae3555d0efae1ad2413fa2a (patch)
treec2dbd199ad6e6bfb6e7ab4c92f39126298c5cc7f
parentbeefe502cf2a40f6b01fa927c9ca12ee5bc8ca34 (diff)
build: Replace dir macros with user_tooldir_prefix
-rwxr-xr-xbuild27
1 files changed, 3 insertions, 24 deletions
diff --git a/build b/build
index 3775e4b..8c61353 100755
--- a/build
+++ b/build
@@ -119,29 +119,15 @@ $(build_targets): configure
touch $@
$(buildnative_targets):
- libsubdir="/usr/lib/$(target)/gcc-$(base_version)" && \
oh-autobuild -B "$(builddir)" -T bootstrap-lean -- -j $${JOBS:-1} \
- libsubdir="$${libsubdir}" \
- libexecsubdir="$${libsubdir}" \
- gcc_gxx_tool_include_dir="/usr/include/$(target)/c++-$(base_version)" \
- libsubincludedir="$${libsubdir}/include" \
- fincludedir="$${libsubdir}/finclude" \
- toolexeclibdir="/usr/lib/$(target)" \
- MULTIOSDIR=.
+ user_tooldir_prefix="/usr/lib/$(target)/gcc-$(base_version)"
#if [ '$(OPK_BUILD_ARCH)' = '$(OPK_HOST_ARCH)' ]; then \
# cd "$(builddir)" && make -k check; \
#fi
$(buildcross_targets):
- libsubdir="/usr/lib/$(target)/gcc-$(base_version)" && \
oh-autobuild -B "$(builddir)" -T all-gcc -- -j $${JOBS:-1} \
- libsubdir="$${libsubdir}" \
- libexecsubdir="$${libsubdir}" \
- gcc_gxx_tool_include_dir="/usr/include/$(target)/c++-$(base_version)" \
- libsubincludedir="$${libsubdir}/include" \
- fincludedir="$${libsubdir}/finclude" \
- toolexeclibdir="/usr/lib/$(target)" \
- MULTIOSDIR=.
+ user_tooldir_prefix="/usr/lib/$(target)/gcc-$(base_version)"
build: $(build_targets)
touch $@
@@ -162,15 +148,8 @@ $(installnative_targets):
# * GNU Make executes any commands that contain "$(MAKE)", even if -n
# is specified.
# See also: <http://gcc.gnu.org/ml/gcc/2013-04/msg00171.html>.
- libsubdir="/usr/lib/$(target)/gcc-$(base_version)" && \
oh-autoinstall -B "$(builddir)" -d "$(destdir)" -T install -- \
- host_installdir=/usr/include/$(target)/c++-$(base_version)/bits \
- libsubdir="$${libsubdir}" \
- libexecsubdir="$${libsubdir}" \
- libsubincludedir="$${libsubdir}/include" \
- fincludedir="$${libsubdir}/finclude" \
- toolexeclibdir="/usr/lib/$(target)" \
- MULTIOSDIR=.
+ user_tooldir_prefix="/usr/lib/$(target)/gcc-$(base_version)"
# Change the target architecture prefix of files in /usr/bin.
rm -f $(destdir)/usr/bin/*-gcc-$(base_version).*
for f in c++ g++ gcc gcc-ar gcc-nm gcc-ranlib; do \