diff --git a/BasePlatform/v1/sdk/cross.yaml b/BasePlatform/v1/sdk/cross.yaml
index 3d75450..e78fa49 100644
--- a/BasePlatform/v1/sdk/cross.yaml
+++ b/BasePlatform/v1/sdk/cross.yaml
@@ -127,7 +127,7 @@ modules:
                 PATH: "/usr/tools_gcc/bin:/usr/tools_ld/bin:/usr/bin"
         post-install:
             - rm -rf /usr/tmp_glibc/etc /usr/tmp_glibc/usr/sbin /usr/tmp_glibc/usr/share /usr/tmp_glibc/var /usr/tmp_glibc/sbin
-            - cp -rfv /usr/tmp_glibc/* /
+            - cp -rvP --remove-destination /usr/tmp_glibc/* /
             - rm -rf /usr/tmp_glibc
         builddir: true
         cleanup:
@@ -170,7 +170,7 @@ modules:
         post-install:
             - rm -rfv /usr/tmp_glibc32/etc /usr/tmp_glibc32/usr/bin /usr/tmp_glibc32/usr/sbin /usr/tmp_glibc32/usr/share /usr/tmp_glibc32/var /usr/tmp_glibc32/sbin
             - find "/usr/tmp_glibc32/usr/include" -type f -not -name '*-32.h' -delete
-            - cp -rfv /usr/tmp_glibc32/* /
+            - cp -rvP --remove-destination /usr/tmp_glibc32/* /
             - rm -rf /usr/tmp_glibc32
             - rm -v /lib/ld-linux.so.2; ln -s /usr/lib32/ld-linux.so.2 /lib/
         builddir: true
@@ -185,13 +185,14 @@ modules:
         build-commands:
             - mkdir build
             - cd build; ../libstdc++-v3/configure
-                --enable-multilib
                 --with-headers=/usr/include
                 --prefix=/usr
                 --disable-nls
                 --disable-werror
+                --disable-bootstrap
                 --enable-default-pie
                 --enable-default-ssp
+                --enable-multilib
                 --enable-shared
                 --enable-static
                 "CC=/usr/bin/ccache /usr/tools_gcc/usr/bin/gcc"
@@ -283,7 +284,6 @@ modules:
             - --enable-default-ssp
             - --enable-gnu-indirect-function
             - --enable-languages=c,c++,lto
-            - --enable-linker-build-id
             - --enable-lto
             - --enable-multilib
             - --enable-plugin
@@ -299,7 +299,7 @@ modules:
                 PATH: "/usr/tools_gcc/usr/bin:/usr/tools_ld/bin:/usr/bin"
         post-install:
             - rm -rfv /usr/tmp_gcc/usr/share
-            - cp -rfv /usr/tmp_gcc/* /
+            - cp -rvP --remove-destination /usr/tmp_gcc/* /
             - rm -rv /usr/tmp_gcc
         builddir: true
         cleanup-platform:
@@ -334,7 +334,7 @@ modules:
                 PATH: "/usr/tools_ld/bin:/usr/bin"
         post-install:
             - rm -rf /usr/tmp_binutils/usr/share
-            - cp -rf /usr/tmp_binutils/usr /
+            - cp -rP --remove-destination /usr/tmp_binutils/usr /
             - rm -rfv /usr/tmp_binutils
         builddir: true
     -   name: cross-test