diff --git a/cross/native.sh b/cross/native.sh
index cffd608..80182d2 100755
--- a/cross/native.sh
+++ b/cross/native.sh
@@ -162,11 +162,12 @@ echo -n Building gcc... | tee -a $LOG
 	$WORKING_DIR/src/gcc/configure --host=x86_64-jehanne \
 		--prefix=/posix --with-sysroot=/ --with-build-sysroot=$JEHANNE \
 		--enable-languages=c,c++ \
-		--disable-multiarch --with-multilib-list=m64 \
+		--disable-multiarch --with-multilib-list= \
 		--without-isl --with-gmp=$JEHANNE/posix --with-mpfr=$JEHANNE/posix --with-mpc=$JEHANNE/posix \
 		--disable-shared --disable-threads --disable-tls \
 		--disable-libgomp --disable-werror --disable-nls  &&
-	make all-gcc all-target-libgcc &&
+	make all-gcc &&
+	make all-target-libgcc &&
 	make DESTDIR=$JEHANNE/pkgs/gcc/9.2.0/ install-gcc install-target-libgcc
 #	$WORKING_DIR/src/gcc/configure --host=x86_64-jehanne --without-isl --prefix=/posix --with-sysroot=/ --with-build-sysroot=$JEHANNE --enable-languages=c,c++ --with-gmp=$JEHANNE/posix --with-mpfr=$JEHANNE/posix --with-mpc=$JEHANNE/posix --disable-shared --disable-threads --disable-tls --disable-bootstrap --disable-libgomp --disable-werror --disable-nls  &&
 #	make all-gcc &&
diff --git a/cross/patch/gcc.patch b/cross/patch/gcc.patch
index ee21081..de1f9d8 100644
--- a/cross/patch/gcc.patch
+++ b/cross/patch/gcc.patch
@@ -2,15 +2,14 @@ diff --git a/src/gcc/gcc/config.gcc b/src/gcc/gcc/config.gcc
 index ddd3b8f..702aa59 100644
 --- a/src/gcc/gcc/config.gcc
 +++ b/src/gcc/gcc/config.gcc
-@@ -947,6 +947,18 @@ case ${target} in
+@@ -947,6 +947,17 @@ case ${target} in
      tmake_file="$tmake_file vms/t-vmsnative"
    fi
    ;;
 +*-*-jehanne*)
 +  gas=yes
 +  gnu_ld=yes
-+  c_target_objs="${c_target_objs} jehanne.o"
-+  cxx_target_objs="${cxx_target_objs} jehanne.o"
++  extra_objs="jehanne.o"
 +  default_use_cxa_atexit=yes
 +  case $target in
 +  x86_64-*)
diff --git a/cross/wrappers/x86_64-jehanne-g++ b/cross/wrappers/x86_64-jehanne-g++
index 83101e1..7718e36 100755
--- a/cross/wrappers/x86_64-jehanne-g++
+++ b/cross/wrappers/x86_64-jehanne-g++
@@ -13,7 +13,7 @@ echo >> $WRAPPER_LOG
 echo >> $WRAPPER_LOG
 
 if echo $ARGS|grep -e '\.cpp\b' -e '\b\-o\b' -e ' -o ' > /dev/null; then
-	TOINCLUDE="-isystem$JEHANNE/posix/x86_64-jehanne/include/c++/9.2.0/ -isystem$JEHANNE/posix/x86_64-jehanne/include/c++/9.2.0/x86_64-jehanne -isystem$JEHANNE/posix/x86_64-jehanne/include/c++/9.2.0/backward -isystem$JEHANNE/posix/lib/gcc/x86_64-jehanne/9.2.0/include -isystem$JEHANNE/posix/include"
+	TOINCLUDE="-isystem$JEHANNE_TOOLCHAIN/cross/posix/x86_64-jehanne/include/c++/9.2.0/ -isystem$JEHANNE/posix/x86_64-jehanne/include/c++/9.2.0/x86_64-jehanne -isystem$JEHANNE/posix/x86_64-jehanne/include/c++/9.2.0/backward -isystem$JEHANNE/posix/lib/gcc/x86_64-jehanne/9.2.0/include -isystem$JEHANNE/posix/include"
 	TOLINK="-L$JEHANNE/posix/lib -lstdc++ -lm -lnewlibc -lposix"
 	date --rfc-3339="ns"  |tee -a $WRAPPER_LOG
 	export >> $WRAPPER_LOG
diff --git a/cross/wrappers/x86_64-jehanne-gcc b/cross/wrappers/x86_64-jehanne-gcc
index f00117f..c8ec575 100755
--- a/cross/wrappers/x86_64-jehanne-gcc
+++ b/cross/wrappers/x86_64-jehanne-gcc
@@ -13,7 +13,7 @@ echo >> $WRAPPER_LOG
 echo >> $WRAPPER_LOG
 
 if echo $ARGS|grep -e '\.c\b' -e '\b\-o\b' -e ' -o ' > /dev/null; then
-	TOINCLUDE="-isystem$JEHANNE/posix/lib/gcc/x86_64-jehanne/9.2.0/include -isystem$JEHANNE/posix/include"
+	TOINCLUDE="-isystem$JEHANNE_TOOLCHAIN/cross/posix/lib/gcc/x86_64-jehanne/9.2.0/include -isystem$JEHANNE/posix/include"
 	TOLINK="-L$JEHANNE/posix/lib -lnewlibc -lposix"
 	date --rfc-3339="ns"  |tee -a $WRAPPER_LOG
 	export >> $WRAPPER_LOG