2 files changed, 18 insertions, 8 deletions
diff --git a/source/d/gcc/gcc.SlackBuild b/source/d/gcc/gcc.SlackBuild
index 8d45967d4..0866c201a 100755
--- a/source/d/gcc/gcc.SlackBuild
+++ b/source/d/gcc/gcc.SlackBuild
@@ -57,7 +57,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=gcc
 SRCVER=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 VERSION=$(echo $SRCVER | cut -f 1 -d _)
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 
 # How many jobs to run in parallel:
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -234,6 +234,15 @@ cat $CWD/slack-desc.gcc-gdc > $PKG10/install/slack-desc
         touch -r ChangeLog $PKG6/usr/doc/gcc-${VERSION}/gcc/objc/ChangeLog
       fi
     )
+    ( cd objcp || exit 0
+      cp -a \
+        README* \
+      $PKG6/usr/doc/gcc-${VERSION}/gcc/objcp
+      if [ -r ChangeLog ]; then
+        cat ChangeLog | head -n 1000 > $PKG6/usr/doc/gcc-${VERSION}/gcc/objcp/ChangeLog
+        touch -r ChangeLog $PKG6/usr/doc/gcc-${VERSION}/gcc/objcp/ChangeLog
+      fi
+    )
 
     mkdir -p $PKG8/usr/doc/gcc-${VERSION}/gcc/go
     ( cd go || exit 0
@@ -339,7 +348,7 @@ cat $CWD/slack-desc.gcc-gdc > $PKG10/install/slack-desc
      --infodir=/usr/info \
      --enable-shared \
      --enable-bootstrap \
-     --enable-languages=ada,brig,c,c++,d,fortran,go,lto,objc \
+     --enable-languages=ada,brig,c,c++,d,fortran,go,lto,objc,obj-c++ \
      --enable-threads=posix \
      --enable-checking=release \
      --enable-objc-gc \
@@ -549,6 +558,7 @@ rm -f $PKG1/{,usr/}lib${LIBDIRSUFFIX}/*.la
   mv $PKG1/usr/libexec/gcc/$TARGET/$VERSION/cc1obj usr/libexec/gcc/$TARGET/$VERSION
   mkdir -p usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include
   mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include/objc usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include
+  mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include/cc1objplus usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include
 )
 
 ## NOTE: Thought about this, because the precompiled headers are so large.
diff --git a/source/d/gcc/slack-desc.gcc-objc b/source/d/gcc/slack-desc.gcc-objc
index 6cf5a3170..ac48f8bdc 100644
--- a/source/d/gcc/slack-desc.gcc-objc
+++ b/source/d/gcc/slack-desc.gcc-objc
@@ -6,14 +6,14 @@
 # leave one space after the ':'.
 
         |-----handy-ruler------------------------------------------------------|
-gcc-objc: gcc-objc (Objective-C support for GCC)
+gcc-objc: gcc-objc (Objective-C/C++ support for GCC)
 gcc-objc:
-gcc-objc: Objective-C support for the GNU Compiler Collection.
+gcc-objc: Objective-C/C++ support for the GNU Compiler Collection.
 gcc-objc:
 gcc-objc: This package contains those parts of the compiler collection needed to
-gcc-objc: compile code written in Objective-C. Objective-C was originally
-gcc-objc: developed to add object-oriented extensions to the C language, and is
-gcc-objc: best known as the native language of the NeXT computer.
-gcc-objc:
+gcc-objc: compile code written in Objective-C and Objective-C++. Objective-C was
+gcc-objc: originally developed to add object-oriented extensions to the C
+gcc-objc: language, and is best known as the native language of the NeXT
+gcc-objc: computer.
 gcc-objc:
 gcc-objc: