diff options
| author |   Alexey Neyman <stilor@att.net> | 2018-12-05 03:12:59 (GMT) |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2018-12-05 03:12:59 (GMT) |
| commit | f8874f447e40852d33d65c1f443a90b0760901df (patch) | |
| tree | f506cfa723b6e3baa28ac30e2be4a314516f5950 /scripts/build/binutils/binutils.sh | |
| parent | dc9fa6ad64f81e3314a469fc434f1dd4abcff0cc (diff) | |
| parent | 1e5c48f190f5f0da9177a1137113b8d4a836ab9e (diff) | |
Merge pull request #1108 from stilor/config-fixes
Config fixes
Diffstat (limited to 'scripts/build/binutils/binutils.sh')
| -rw-r--r-- | scripts/build/binutils/binutils.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/build/binutils/binutils.sh b/scripts/build/binutils/binutils.sh index f61b556..d1745a3 100644 --- a/scripts/build/binutils/binutils.sh +++ b/scripts/build/binutils/binutils.sh @@ -153,6 +153,11 @@ do_binutils_backend() { if [ "${CT_BINUTILS_PLUGINS}" = "y" ]; then extra_config+=( --enable-plugins ) fi + if [ "${CT_BINUTILES_RELRO}" = "y" ]; then + extra_config+=( --enable-relro ) + elif [ "${CT_BINUTILS_RELRO}" != "m" ]; then + extra_config+=( --disable-relro ) + fi if [ "${CT_BINUTILS_HAS_PKGVERSION_BUGURL}" = "y" ]; then [ -n "${CT_PKGVERSION}" ] && extra_config+=("--with-pkgversion=${CT_PKGVERSION}") [ -n "${CT_TOOLCHAIN_BUGURL}" ] && extra_config+=("--with-bugurl=${CT_TOOLCHAIN_BUGURL}") @@ -221,7 +226,7 @@ do_binutils_backend() { rm -f "${prefix}/bin/${CT_TARGET}-ld" rm -f "${prefix}/${CT_TARGET}/bin/ld" sed -r -e "s/@@DEFAULT_LD@@/${CT_BINUTILS_LINKER_DEFAULT}/" \ - "${CT_LIB_DIR}/scripts/build/binutils/binutils-ld.in" \ + "${CT_LIB_DIR}/packages/binutils/binutils-ld.in" \ >"${prefix}/bin/${CT_TARGET}-ld" chmod a+x "${prefix}/bin/${CT_TARGET}-ld" cp -a "${prefix}/bin/${CT_TARGET}-ld" \ |