Skip to content
Snippets Groups Projects
Commit f1044b1d authored by Natanael Copa's avatar Natanael Copa
Browse files

main/gcc: fix cross g++

fixes commit 9b8a9d76 (main/gcc: split libstdc++-dev)
parent 9f94d749
No related branches found
No related tags found
No related merge requests found
...@@ -9,7 +9,7 @@ pkgver=12.1.1_git20220630 ...@@ -9,7 +9,7 @@ pkgver=12.1.1_git20220630
[ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target="" [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
pkgname="$pkgname$_target" pkgname="$pkgname$_target"
pkgrel=5 pkgrel=6
pkgdesc="The GNU Compiler Collection" pkgdesc="The GNU Compiler Collection"
url="https://gcc.gnu.org" url="https://gcc.gnu.org"
arch="all" arch="all"
...@@ -144,7 +144,7 @@ esac ...@@ -144,7 +144,7 @@ esac
_languages=c _languages=c
if $LANG_CXX; then if $LANG_CXX; then
subpackages="$subpackages libstdc++:libcxx:$CTARGET_ARCH libstdc++-dev:libcxx_dev:$CTARGET_ARCH g++$_target:gpp" subpackages="$subpackages libstdc++:libcxx:$CTARGET_ARCH libstdc++-dev$_target:libcxx_dev g++$_target:gpp"
_languages="$_languages,c++" _languages="$_languages,c++"
fi fi
if $LANG_D; then if $LANG_D; then
...@@ -537,16 +537,16 @@ libcxx_dev() { ...@@ -537,16 +537,16 @@ libcxx_dev() {
depends= depends=
replaces="g++" replaces="g++"
amove usr/lib/libstdc++.a \ amove usr/${_target:+$CTARGET/}lib/libstdc++.a \
usr/lib/libstdc++.so \ usr/${_target:+$CTARGET/}lib/libstdc++.so \
usr/lib/libstdc++fs.a \ usr/${_target:+$CTARGET/}lib/libstdc++fs.a \
usr/lib/libsupc++.a \ usr/${_target:+$CTARGET/}lib/libsupc++.a \
usr/include/c++ usr/${_target:+$CTARGET/}include/c++
} }
gpp() { gpp() {
pkgdesc="GNU C++ standard library and compiler" pkgdesc="GNU C++ standard library and compiler"
depends="libstdc++=$_gccrel libstdc++-dev=$_gccrel gcc=$_gccrel libc-dev" depends="libstdc++=$_gccrel libstdc++-dev$_target=$_gccrel gcc$_target=$_gccrel libc-dev"
mkdir -p "$subpkgdir/$_gcclibexec" \ mkdir -p "$subpkgdir/$_gcclibexec" \
"$subpkgdir"/usr/bin \ "$subpkgdir"/usr/bin \
"$subpkgdir"/usr/${_target:+$CTARGET/}include \ "$subpkgdir"/usr/${_target:+$CTARGET/}include \
......
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