diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2019-01-04 20:55:22 +0100 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2019-01-04 20:57:59 +0100 |
| commit | 16f334babfb02f67c9d529ce4758fafbe1290787 (patch) | |
| tree | 03e92102bf12b0ae523f08fe8e9d623bb3b76541 | |
| parent | scripts/bootstrap-prefix: ensure temp libgcc_s remains available (diff) | |
| download | prefix-16f334babfb02f67c9d529ce4758fafbe1290787.tar.gz prefix-16f334babfb02f67c9d529ce4758fafbe1290787.tar.bz2 prefix-16f334babfb02f67c9d529ce4758fafbe1290787.zip | |
scripts/bootstrap-prefix: ensure get_libdir doesn't return newlines
When portageq fails, it returns a newline, which we don't want to have
in our LDFLAGS (or anywhere else), so make sure we check if portageq
returned something useful.
Signed-off-by: Fabian Groffen <grobian@gentoo.org>
| -rwxr-xr-x | scripts/bootstrap-prefix.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index ff5132ae7e..66edd753cf 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -1668,7 +1668,11 @@ bootstrap_stage3() { fi fi - get_libdir() { portageq envvar LIBDIR_$(portageq envvar ABI) || echo lib; } + get_libdir() { + local l=$(portageq envvar LIBDIR_$(portageq envvar ABI) 2>/dev/null) + [[ -z ${l} ]] && l=lib + echo ${l} + } export CONFIG_SHELL="${ROOT}"/tmp/bin/bash export CPPFLAGS="-isystem ${ROOT}/usr/include" |