Lines 295-300
Link Here
|
295 |
eval $(grep -h '^LDPATH=' "${GCC_ENV_D}"/${CHOST}-* | tail -1) |
295 |
eval $(grep -h '^LDPATH=' "${GCC_ENV_D}"/${CHOST}-* | tail -1) |
296 |
LDPATH=${LDPATH%%:*} |
296 |
LDPATH=${LDPATH%%:*} |
297 |
|
297 |
|
|
|
298 |
local libdir="${EROOT}${GENTOO_LIBDIR}" |
299 |
local usrlibdir="${EROOT}usr/${GENTOO_LIBDIR}" |
300 |
# If /lib and /usr/lib are the same, we have USE=-split-usr and usrmerge. |
301 |
# Hence we do not need the following safety net. |
302 |
[ "${usrlibdir}" -ef "${libdir}" ] && return 0 |
303 |
|
298 |
# If /usr isn't a sep mount, then don't bother with linking stuff. |
304 |
# If /usr isn't a sep mount, then don't bother with linking stuff. |
299 |
if ln "${ROOT}/${LDPATH}/libgcc.a" "${EROOT}"/lib/.gcc.config.$$ 2>/dev/null ; then |
305 |
if ln "${ROOT}/${LDPATH}/libgcc.a" "${EROOT}"/lib/.gcc.config.$$ 2>/dev/null ; then |
300 |
rm -f "${EROOT}"/lib/.gcc.config.$$ |
306 |
rm -f "${EROOT}"/lib/.gcc.config.$$ |
Lines 312-318
Link Here
|
312 |
# Only bother with this stuff for the native ABI. We assume the user |
318 |
# Only bother with this stuff for the native ABI. We assume the user |
313 |
# doesn't have critical binaries for non-native ABIs which is fair. |
319 |
# doesn't have critical binaries for non-native ABIs which is fair. |
314 |
local gcclib |
320 |
local gcclib |
315 |
local libdir="${EROOT}${GENTOO_LIBDIR}" |
|
|
316 |
mkdir -p "${libdir}"/.gcc.config.new || return 0 # !?!?! |
321 |
mkdir -p "${libdir}"/.gcc.config.new || return 0 # !?!?! |
317 |
for gcclib in gcc_s unwind ; do |
322 |
for gcclib in gcc_s unwind ; do |
318 |
# This assumes that we always have the .so symlink, |
323 |
# This assumes that we always have the .so symlink, |