Update to rscons 2.3.0

Move cross compiler to i686-elf-gcc directory.
Automatically build cross compiler using rscons subsidiary script.

.gitignore

@@ -4,10 +4,10 @@
 *.lst
 *.map
 *.bin
-/.rscons*
+.rscons*
-/cross/.rscons*
+/i686-elf-gcc/build*/
-/cross/build*/
+/i686-elf-gcc/*.xz
-/cross/*.xz
+/i686-elf-gcc/binutils-*/
-/cross/binutils-*/
+/i686-elf-gcc/gcc-*/
-/cross/gcc-*/
+/i686-elf-gcc/i686-elf-gcc/
 /build/

Rsconscript

@@ -1,4 +1,7 @@
+path_prepend "i686-elf-gcc/i686-elf-gcc/bin"
+
 configure do
+  rscons "i686-elf-gcc"
   check_c_compiler "i686-elf-gcc"
   check_program "genext2fs"
   check_program "grub-mkstandalone"

cross/Rsconscript

@@ -1,11 +0,0 @@
-configure do
-  check_c_compiler "gcc"
-  check_program "make"
-  check_program "bison"
-  check_program "flex"
-  check_program "texi2any"
-  check_program "wget"
-  check_lib "gmp"
-  check_lib "mpc"
-  check_lib "mpfr"
-end

cross/configure

@@ -1,2 +0,0 @@
-#!/bin/sh
-../rscons configure

i686-elf-gcc/Rsconscript

@@ -0,0 +1,17 @@
+configure do
+  check_c_compiler "gcc"
+  check_program "make"
+  check_program "bison"
+  check_program "flex"
+  check_program "texi2any", on_fail: "Install the texinfo package"
+  check_program "wget"
+  check_lib "gmp", on_fail: "Install the libgmp-dev package"
+  check_lib "mpc", on_fail: "Install the libmpc-dev package"
+  check_lib "mpfr", on_fail: "Install the libmpfr-dev package"
+end
+
+build do
+  unless File.exist?("i686-elf-gcc")
+    system("./build.sh")
+  end
+end

i686-elf-gcc/build.sh

@@ -31,7 +31,7 @@ if [ ! -d gcc-${GCC_VERSION} ]; then
   tar xJf gcc-${GCC_VERSION}.tar.xz
 fi
 
-export PREFIX="$HOME/.local"
+export PREFIX="$PWD/i686-elf-gcc"
 export TARGET="i686-elf"
 export PATH="$PREFIX/bin:$PATH"
 

i686-elf-gcc/configure

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec ../rscons configure