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

Jump to bottom

Making libmpx configurable & moving gcc libs: more fixes #461

Merged
merged 3 commits into from
Nov 8, 2016
Merged

Making libmpx configurable & moving gcc libs: more fixes #461

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3330ad7
Fine-tune moving gcc libraries to sysroot.
stilor Oct 5, 2016
339b83c
MINGW doesn't like libmpx either.
stilor Oct 5, 2016
91575d0
Merge branch 'master' into static-libgcc-more-fixes
stilor Oct 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion config/cc/gcc.in.2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,8 @@ config CC_GCC_LIBMPX
prompt "Compile libmpx"
depends on CC_GCC_HAS_LIBMPX
depends on ARCH_x86
depends on !LIBC_musl # MUSL does not define libc types that GCC requires
# MUSL does not define libc types that GCC requires. Mingw lacks certain headers.
depends on !LIBC_musl && ! LIBC_mingw
help
Enable GCC support for Intel Memory Protection Extensions (MPX).

Expand Down
12 changes: 12 additions & 0 deletions scripts/build/cc/100-gcc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -780,8 +780,20 @@ gcc_movelibs() {

# Move only files, directories are for other multilibs
gcc_dir="${CT_PREFIX_DIR}/${CT_TARGET}/lib/${multi_os_dir}"
if [ ! -d "${gcc_dir}" ]; then
# GCC didn't install anything outside of sysroot
return
fi
ls "${gcc_dir}" | while read f; do
case "${f}" in
*.ld)
# Linker scripts remain in GCC's directory; elf2flt insists on
# finding them there.
continue
;;
esac
if [ -f "${gcc_dir}/${f}" ]; then
CT_DoExecLog ALL mkdir -p "${multi_root}/lib/${multi_os_dir}"
CT_DoExecLog ALL mv "${gcc_dir}/${f}" "${multi_root}/lib/${multi_os_dir}/${f}"
fi
done
Expand Down