Skip to content
Snippets Groups Projects
Commit bae9e2d7 authored by Ariadne Conill's avatar Ariadne Conill
Browse files

main/gcc: disable all paxmark calls when cross-building

parent 625464be
No related branches found
No related tags found
No related merge requests found
......@@ -370,9 +370,7 @@ package() {
"$pkgdir"/usr/share/gdb/python/auto-load/usr/lib/
# only paxmark if cross-compiling, otherwise paxctl fails
if [ "$CBUILD" = "$CTARGET" ]; then
paxmark -pmrs "$pkgdir"/$_gcclibexec/cc1 || return 1
fi
[ "$CBUILD" = "$CTARGET" ] && (paxmark -pmrs "$pkgdir"/$_gcclibexec/cc1 || return 1)
# move ada runtime libs
if $LANG_ADA; then
......@@ -429,7 +427,7 @@ gpp() {
"$subpkgdir"/usr/${_cross:+$CTARGET/}lib \
mv "$pkgdir/$_gcclibexec/cc1plus" "$subpkgdir/$_gcclibexec/"
paxmark -pmrs "$subpkgdir/$_gcclibexec/cc1plus" || return 1
[ "$CBUILD" = "$CTARGET" ] && (paxmark -pmrs "$subpkgdir/$_gcclibexec/cc1plus" || return 1)
mv "$pkgdir"/usr/${_cross:+$CTARGET/}lib/*++* "$subpkgdir"/usr/${_cross:+$CTARGET/}lib/ || return 1
mv "$pkgdir"/usr/${_cross:+$CTARGET/}include/c++ "$subpkgdir"/usr/${_cross:+$CTARGET/}include/ || return 1
......@@ -480,7 +478,7 @@ java() {
pkgdesc="Java support for GCC"
depends="zlib-dev gcc=$_gccrel libgcj=$_gccrel"
paxmark -pm "$pkgdir"/$_gcclibexec/ecj1 || return 1
[ "$CBUILD" = "$CTARGET" ] && (paxmark -pm "$pkgdir"/$_gcclibexec/ecj1 || return 1)
mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/usr/lib "$subpkgdir"/$_gcclibdir/
cd "$pkgdir"/usr/bin
mv gcj gcj-dbtool gjavah gcjh jcf-dump "$subpkgdir"/usr/bin/
......@@ -506,7 +504,7 @@ libgcj() {
mkdir -p "$subpkgdir"/usr/bin
cd "$pkgdir"/usr/bin
paxmark -pmse "$pkgdir"/usr/bin/gij || return 1
[ "$CBUILD" = "$CTARGET" ] && (paxmark -pmse "$pkgdir"/usr/bin/gij || return 1)
mv aot-compile gappletviewer gc-analyze gij gjar gjarsigner gkeytool\
gnative2ascii gorbd grmic grmid grmiregistry gserialver \
gtnameserv jv-convert rebuild-gcj-db \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment