diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2019-01-06 12:38:15 +0100 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2019-01-06 12:38:47 +0100 |
| commit | d327db7632339373acfb1482a29b4aa3dd92120d (patch) | |
| tree | b8d31e52d6db649d1f69f6bc2986d98288a171c3 | |
| parent | scripts/bootstrap-prefix: ensure get_libdir doesn't return newlines (diff) | |
| download | prefix-d327db7632339373acfb1482a29b4aa3dd92120d.tar.gz prefix-d327db7632339373acfb1482a29b4aa3dd92120d.tar.bz2 prefix-d327db7632339373acfb1482a29b4aa3dd92120d.zip | |
scripts/bootstrap-prefix: make libgcc_s copying verbose
Signed-off-by: Fabian Groffen <grobian@gentoo.org>
| -rwxr-xr-x | scripts/bootstrap-prefix.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 66edd753cf..e9cafdb11d 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -1538,13 +1538,15 @@ bootstrap_stage2() { # this in rpath while it does find it, resulting in a runtime trap if [[ ${CHOST} == x86_64-*-solaris* || ${CHOST} == sparcv9-*-solaris* ]] ; then + local libgccs64=/usr/sfw/lib/64/libgcc_s.so.1 [[ -e ${ROOT}/tmp/usr/bin/gcc ]] || \ - cp /usr/sfw/lib/64/libgcc_s.so.1 "${ROOT}"/tmp/usr/lib/ >& /dev/null + cp "${libgccs64}" "${ROOT}"/tmp/usr/lib/ # save another copy for after gcc-config gets run and removes # usr/lib/libgcc_s.* because new links should use the compiler - # specific libgcc_s. + # specific libgcc_s, but existing objs need to find this + # libgcc_s for as long as they are around (bash->libreadline) LDFLAGS="${LDFLAGS} -R${ROOT}/tmp/tmp" - cp /usr/sfw/lib/64/libgcc_s.so.1 "${ROOT}"/tmp/tmp/ >& /dev/null + cp "${libgccs64}" "${ROOT}"/tmp/tmp/ fi # Disable RAP directory hacks of binutils and gcc. If libc.so |