Skip to content

Commit 189454b

Browse files
Fix build error on Ubuntu
/bin/dash on Ubuntu doesn't support bash string expansions 'install-{gas,binutils,ld}', which causes a build error. This patch replace bashism with plain dumb text repetitions. Signed-off-by: Anton Kolesov <[email protected]>
1 parent fcf0116 commit 189454b

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

build-elf32.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,8 @@ make_target building all-binutils all-gas all-ld
172172
make_target installing ${HOST_INSTALL}-binutils ${HOST_INSTALL}-gas ${HOST_INSTALL}-ld
173173
if [ "$DO_PDF" = "--pdf" ]
174174
then
175-
make_target "generating PDF documentation" install-pdf-{binutils,ld,gas}
175+
make_target "generating PDF documentation" install-pdf-binutils \
176+
install-pdf-ld install-pdf-gas
176177
fi
177178

178179
# GCC

build-uclibc.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -379,11 +379,12 @@ fi
379379
build_dir_init binutils
380380
configure_uclibc_stage2 binutils
381381
make_target building all-binutils all-gas all-ld
382-
make_target installing install-{binutils,ld}
382+
make_target installing install-binutils install-ld
383383
make_target "installing gas" install-gas
384384
if [ $DO_PDF == --pdf ]
385385
then
386-
make_target "generating PDF documentation" install-pdf-{binutils,ld,gas}
386+
make_target "generating PDF documentation" install-pdf-binutils \
387+
install-pdf-ld install-pdf-gas
387388
fi
388389

389390
# -----------------------------------------------------------------------------
@@ -398,7 +399,7 @@ export PATH
398399
# Build stage 1 GCC
399400
build_dir_init gcc-stage1
400401
configure_uclibc_stage1 gcc
401-
make_target building all-{gcc,target-libgcc}
402+
make_target building all-gcc all-target-libgcc
402403
make_target installing ${HOST_INSTALL}-gcc install-target-libgcc
403404
# No need for PDF docs for stage 1.
404405

@@ -494,8 +495,9 @@ unset oldpath
494495
# GCC stage 2
495496
build_dir_init gcc-stage2
496497
configure_uclibc_stage2 gcc
497-
make_target building all-{gcc,target-libgcc,target-libstdc++-v3}
498-
make_target installing ${HOST_INSTALL}-gcc install-{target-libgcc,target-libstdc++-v3}
498+
make_target building all-gcc all-target-libgcc all-target-libstdc++-v3
499+
make_target installing ${HOST_INSTALL}-gcc install-target-libgcc \
500+
install-target-libstdc++-v3
499501
if [ "$DO_PDF" = "--pdf" ]
500502
then
501503
make_target "generating PDF documentation" install-pdf-gcc

0 commit comments

Comments
 (0)