diff --git a/.gitignore b/.gitignore index 7f7dc97..bd6b6c8 100644 --- a/.gitignore +++ b/.gitignore @@ -5,9 +5,9 @@ *.map *.bin /.rscons* -/x86_64-cross/.rscons* -/x86_64-cross/build*/ -/x86_64-cross/*.xz -/x86_64-cross/binutils-*/ -/x86_64-cross/gcc-*/ +/cross/.rscons* +/cross/build*/ +/cross/*.xz +/cross/binutils-*/ +/cross/gcc-*/ /build/ diff --git a/Rsconscript b/Rsconscript index 98c8804..f44e597 100644 --- a/Rsconscript +++ b/Rsconscript @@ -1,5 +1,5 @@ configure do - check_c_compiler "x86_64-elf-gcc", on_fail: "Install cross compiler from x86_64-cross directory" + check_c_compiler "i686-elf-gcc" check_program "genext2fs" check_program "grub-mkstandalone" check_program "mformat", on_fail: "Install the mtools package" diff --git a/x86_64-cross/Rsconscript b/cross/Rsconscript similarity index 100% rename from x86_64-cross/Rsconscript rename to cross/Rsconscript diff --git a/x86_64-cross/build.sh b/cross/build.sh similarity index 98% rename from x86_64-cross/build.sh rename to cross/build.sh index df7ff80..20f8379 100755 --- a/x86_64-cross/build.sh +++ b/cross/build.sh @@ -32,7 +32,7 @@ if [ ! -d gcc-${GCC_VERSION} ]; then fi export PREFIX="$HOME/.local" -export TARGET="x86_64-elf" +export TARGET="i686-elf" export PATH="$PREFIX/bin:$PATH" function build_binutils() diff --git a/x86_64-cross/configure b/cross/configure similarity index 100% rename from x86_64-cross/configure rename to cross/configure