diff --git a/libreoffice.spec b/libreoffice.spec
index 0775d60..1969a30 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -78,6 +78,7 @@ Source70:	%{srcurl}1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.ox
 Source71:	%{srcurl}lxml-4.1.1.tgz
 Source72:	%{devexurl}/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf
 
+Source80:	loffice-libcxx-wrapper.sh
 Source1000:	libreoffice.rpmlintrc
 
 Patch0:		libreoffice-5.4.0.1-disable-test-languagetag.patch
@@ -2958,12 +2959,13 @@ export CCACHE_DIR=%{ccachedir}
 # -> "argument unused during compilation: '-stdlib=libc++'" ->
 # -> -Wno-unused-command-line-argument
 export CXXFLAGS="$CXXFLAGS -stdlib=libc++ -nostdinc++ -I/usr/include/c++/v1 -Wno-unused-command-line-argument"
-# Try to avoid overlinkg C code with libc++ by adjusting CXXFLAGS instead of LDFLAGS
-export CXXFLAGS="$CXXFLAGS -Xlinker -lc++ -Xlinker -lc++abi"
 # Workaround old system boost being incompatible with C++17 which removed std::auto_ptr
 # https://github.com/TRIQS/triqs/issues/523#issuecomment-351960463
 export CXXFLAGS="$CXXFLAGS -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR"
 %clang_gcc_wrapper
+export LIBCCX_LIBS="-lc++ -lc++abi"
+install -m0755 %{SOURCE80} "local_bin/clang++wr"
+sed -i -e "s,/usr/bin/clang++,${PWD}/local_bin/clang++wr,g" "local_bin/clang++"
 %endif
 
 echo "Configure start at: "`date` >> ooobuildtime.log 
@@ -3079,10 +3081,9 @@ cp %{SOURCE72} external/tarballs/
 
 touch external/tarballs/.downloaded
 
-# (tpg) silent output to reduce memory and free space 
 # We use make build here because the default target is "allandcheck".
 # Checking should go to check
-%make -r -s V=0 build-nocheck
+%make V=1 verbose=t build-nocheck
 
 echo "Make end at: "`date` >> ooobuildtime.log 
 echo "Install start at: "`date` >> ooobuildtime.log 
diff --git a/loffice-libcxx-wrapper.sh b/loffice-libcxx-wrapper.sh
new file mode 100644
index 0000000..1feb8bb
--- /dev/null
+++ b/loffice-libcxx-wrapper.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+/usr/bin/clang++ "$@" $LIBCCX_LIBS