diff options
| author |   Repository QA checks <repo-qa-checks@gentoo.org> | 2017-02-02 23:02:18 +0000 |
|---|---|---|
| committer | Repository QA checks <repo-qa-checks@gentoo.org> | 2017-02-02 23:02:18 +0000 |
| commit | 6046ff231a45af10c6a1005d74745fca273db65c (patch) | |
| tree | 9fba62eba92b7184be3d0c181bd5604fe36384f3 | |
| parent | 2017-02-02 22:22:18 UTC (diff) | |
| parent | toolchain.eclass: pax-mark java compiler #574808 (diff) | |
| download | gentoo-6046ff231a45af10c6a1005d74745fca273db65c.tar.gz gentoo-6046ff231a45af10c6a1005d74745fca273db65c.tar.bz2 gentoo-6046ff231a45af10c6a1005d74745fca273db65c.zip | |
Merge updates from master
| -rw-r--r-- | eclass/toolchain.eclass | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 0d8148ffadf3..f2b1a865fe73 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1835,6 +1835,12 @@ toolchain_src_install() { pax-mark -r "${D}${PREFIX}/libexec/gcc/${CTARGET}/${GCC_CONFIG_VER}/cc1" pax-mark -r "${D}${PREFIX}/libexec/gcc/${CTARGET}/${GCC_CONFIG_VER}/cc1plus" fi + + # Disable MMROTECT so java works. #574808 + if is_gcj ; then + pax-mark -m "${D}${PREFIX}/libexec/gcc/${CTARGET}/${GCC_CONFIG_VER}/ecj1" + pax-mark -m "${D}${PREFIX}/${CTARGET}/gcc-bin/${GCC_CONFIG_VER}/gij" + fi } # Move around the libs to the right location. For some reason, |