summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorP. J. McDermott <pjm@nac.net>2013-05-27 13:14:54 (EDT)
committer P. J. McDermott <pjm@nac.net>2013-05-27 13:14:54 (EDT)
commitdab74f281a7d4f903f3dae312abd790a9ac46f6b (patch)
treed6f8cb7b3fb9f25619852b08d22127bade5ad9cd
parent10d2ef04cf658de8cfded4123b3b99e589591fbe (diff)
build: Wrap some long lines.
-rwxr-xr-xbuild59
1 files changed, 33 insertions, 26 deletions
diff --git a/build b/build
index 8eb83b5..1a3ad5e 100755
--- a/build
+++ b/build
@@ -8,13 +8,13 @@ nop:
configure:
# Generate the main makefile.
# * Use multiarch library search directories.
- # - The library path is given to ld/configure through host_configargs in
- # Makefile's "configure-host" target.
- # - If we're building a cross ld, search only target-specific library
- # paths.
+ # - The library path is given to ld/configure through
+ # host_configargs in Makefile's "configure-host" target.
+ # - If we're building a cross ld, search only target-specific
+ # library paths.
# * Use shared BFD and opcodes libraries for all utilities.
- # - That is, dynamically link the utilities against a single copy of the
- # BFD and opcodes libraries.
+ # - That is, dynamically link the utilities against a single copy of
+ # the BFD and opcodes libraries.
# * Don't enable multilib (multiarch is better).
# * Enable plugins.
for target in $$(cat ../targets); do \
@@ -27,14 +27,16 @@ configure:
LIB_PATH="$${LIB_PATH}:=/lib/$${target}"; \
LIB_PATH="$${LIB_PATH}:=/usr/lib/$${target}"; \
fi; \
- CFLAGS='$(CFLAGS)' host_configargs="--with-lib-path=$${LIB_PATH}" \
- oh-autoconfigure -B "build-$${target}" -t "$${target}" -- \
+ CFLAGS='$(CFLAGS)' \
+ host_configargs="--with-lib-path=$${LIB_PATH}" \
+ oh-autoconfigure \
+ -B "build-$${target}" -t "$${target}" -- \
--with-sysroot="$${OPK_SYSROOT:-/}" \
--program-transform-name="s&^&$${target}-&" \
--enable-shared --disable-multilib \
--enable-plugins \
--with-pkgversion='GNU Binutils for ProteanOS' || \
- exit 1; \
+ exit 1; \
done
# Generate all the individual program makefiles.
for target in $$(cat ../targets); do \
@@ -42,7 +44,7 @@ configure:
tooldir='/usr/tool' scriptdir="/usr/lib/$${target}" \
bfdlibdir="/usr/lib/$(OPK_HOST_ARCH)/$${target}" \
bfdincludedir="/usr/include/$(OPK_HOST_ARCH)/$${target}" || \
- exit 1; \
+ exit 1; \
done
touch $@
@@ -78,23 +80,24 @@ install: build
# * scriptdir contains target ldscripts.
# * ldscripts are specific to both the host and target architectures.
# - If host != target, only target-specific paths are passed as
- # arguments to SEARCH_DIR commands in ldscripts. (See the LIB_PATH
- # stuff in the "configure" target above.)
+ # arguments to SEARCH_DIR commands in ldscripts. (See the
+ # LIB_PATH stuff in the "configure" target above.)
# * All of these macro settings are effective thanks to
# `patches/01_pass-some-dirs-to-child-makes.patch`.
for target in $$(cat ../targets); do \
- oh-autoinstall -B "build-$${target}" -d "binutils-$${target}.data" \
+ oh-autoinstall \
+ -B "build-$${target}" -d "binutils-$${target}.data" \
CFLAGS='$(CFLAGS)' \
tooldir='/usr/tool' \
scriptdir="/usr/lib/$(OPK_HOST_ARCH)/$${target}" \
bfdlibdir="/usr/lib/$(OPK_HOST_ARCH)/$${target}" \
bfdincludedir="/usr/include/$(OPK_HOST_ARCH)/$${target}" || \
- exit 1; \
+ exit 1; \
done
# Do some cleanup.
- # * /usr/tool/bin (TOOLBINDIR) contains hard links to tools. A quick look
- # at the code suggests we don't need them; ld *should* work without them
- # in any sane configuration.
+ # * /usr/tool/bin (TOOLBINDIR) contains hard links to tools. A quick
+ # look at the code suggests we don't need them; ld *should* work
+ # without them in any sane configuration.
# * We don't need a static libiberty.
# * Remove static library dependency metadata generated by libtool.
for target in $$(cat ../targets); do \
@@ -110,7 +113,8 @@ install: build
for target in $$(cat ../targets); do \
if [ '$(OPK_HOST_ARCH)' = "$${target}" ]; then \
for util in "binutils-$${target}.data/usr/bin/$${target}-"*; do \
- ln -sf "$${util##*/}" "$${util%/*}/$${util##*/$${target}-}"; \
+ ln -sf "$${util##*/}" \
+ "$${util%/*}/$${util##*/$${target}-}"; \
done \
fi; \
done
@@ -129,23 +133,26 @@ install: build
mkdir -p 'binutils-locales.data/usr/share'
for target in $$(cat ../targets); do \
if [ ! -d 'binutils-doc.data/usr/share/man' ]; then \
- mv "binutils-$${target}.data/usr/share/man" 'binutils-doc.data/usr/share' || \
- exit 1; \
+ mv "binutils-$${target}.data/usr/share/man" \
+ 'binutils-doc.data/usr/share' || \
+ exit 1; \
for file in 'binutils-doc.data/usr/share/man/man1/'*; do \
mv "$${file}" "$${file%/*}/$${file##*/$${target}-}" || \
- exit 1; \
+ exit 1; \
done; \
fi; \
if [ ! -d 'binutils-doc.data/usr/share/info' ]; then \
- mv "binutils-$${target}.data/usr/share/info" 'binutils-doc.data/usr/share' || \
- exit 1; \
+ mv "binutils-$${target}.data/usr/share/info" \
+ 'binutils-doc.data/usr/share' || \
+ exit 1; \
fi; \
if [ ! -d 'binutils-locales.data/usr/share/locale' ]; then \
- mv "binutils-$${target}.data/usr/share/locale" 'binutils-locales.data/usr/share' || \
- exit 1; \
+ mv "binutils-$${target}.data/usr/share/locale" \
+ 'binutils-locales.data/usr/share' || \
+ exit 1; \
fi; \
rm -Rf "binutils-$${target}.data/usr/share" || \
- exit 1; \
+ exit 1; \
done
# Move BFD development files into libbfd-dev-* data directory.
for target in $$(cat ../targets); do \