diff --git a/.orchestra/config/components/toolchain/lib/gcc.lib.yml b/.orchestra/config/components/toolchain/lib/gcc.lib.yml
index 2980152d844282f5a3d65abc1e811dcd839989fe..fe98efb77cb08753f0fd978e103cfb9517ff5e86 100644
--- a/.orchestra/config/components/toolchain/lib/gcc.lib.yml
+++ b/.orchestra/config/components/toolchain/lib/gcc.lib.yml
@@ -139,12 +139,13 @@ install: |
 
   NEW_GCC_PATH="(@= new_gcc_path(triple=triple, gcc_version=gcc_version) @)"
 
-  if test -e ${DESTDIR}${NEW_GCC_PATH}/gcc && ! test -e ${DESTDIR}${NEW_GCC_PATH}/cc; then
-    ln -s gcc ${DESTDIR}${NEW_GCC_PATH}/cc
+  if test -e "${DESTDIR}${NEW_GCC_PATH}/gcc" && ! test -e "${DESTDIR}${NEW_GCC_PATH}/cc"; then
+    ln -s gcc "${DESTDIR}${NEW_GCC_PATH}/cc"
   fi
-  if test -e ${DESTDIR}${NEW_GCC_PATH}/g++ && ! test -e ${DESTDIR}${NEW_GCC_PATH}/c++; then
-    ln -s g++ ${DESTDIR}${NEW_GCC_PATH}/c++
+  if test -e "${DESTDIR}${NEW_GCC_PATH}/g++" && ! test -e "${DESTDIR}${NEW_GCC_PATH}/c++"; then
+    ln -s g++ "${DESTDIR}${NEW_GCC_PATH}/c++"
   fi
+  rm -f "${DESTDIR}${ORCHESTRA_ROOT}"/lib64/libcc1.*
 dependencies: #@ dependencies
 build_dependencies: #@ build_dependencies
 #@ end