Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use gcc --sysroot in rap stage3 post glibc install #22

Closed
wants to merge 1 commit into from
Closed

Use gcc --sysroot in rap stage3 post glibc install #22

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions scripts/bootstrap-prefix.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2111,13 +2111,11 @@ bootstrap_stage3() {
)
# use the new dynamic linker in place of rpath from now on.
RAP_DLINKER=$(echo "${ROOT}"/$(get_libdir)/ld*.so.[0-9] | sed s"!${ROOT}/$(get_libdir)/ld-lsb.*!!")
export LDFLAGS="-L${ROOT}/usr/$(get_libdir) -Wl,--dynamic-linker=${RAP_DLINKER}"
if [[ ${compiler_type} == gcc ]] ; then
# make sure these flags are used even in places that ignore/strip CPPFLAGS/LDFLAGS
export LDFLAGS="-B${ROOT}/usr/$(get_libdir) ${LDFLAGS}"
export CC="gcc ${CPPFLAGS} ${LDFLAGS}"
export CXX="g++ ${CPPFLAGS} ${LDFLAGS}"
fi
export CPPFLAGS="--sysroot=${ROOT}"
export LDFLAGS="-Wl,--dynamic-linker=${RAP_DLINKER}"
# make sure these flags are used even in places that ignore/strip CPPFLAGS/LDFLAGS
export CC="gcc ${CPPFLAGS} ${LDFLAGS}"
export CXX="g++ ${CPPFLAGS} ${LDFLAGS}"
BOOTSTRAP_RAP=yes \
pre_emerge_pkgs --nodeps "${pkgs[@]}" || return 1

Expand Down