From 119d15393abe1bd0d31e7c9864799063b9b5dc28 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Sat, 14 Sep 2019 14:28:48 +0200
Subject: Fixed cross compiler sourcing

---
 cross.sh | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 cross.sh

(limited to 'cross.sh')

diff --git a/cross.sh b/cross.sh
old mode 100644
new mode 100755
index c6a6900..a88212f
--- a/cross.sh
+++ b/cross.sh
@@ -1,10 +1,10 @@
 #!/usr/bin/env sh
 # Sets up a cross compiler
 
-if [ ! -d "./cross/" ]; then
+if [ ! -d "./cross64/" ]; then
   # Create directory
-  mkdir -p cross
-  cd cross || exit
+  mkdir -p cross64
+  cd cross64 || exit
   DIR=$(pwd)
 
   # Get sources
@@ -32,10 +32,16 @@ if [ ! -d "./cross/" ]; then
   make all-target-libgcc
   make install-gcc
   make install-target-libgcc
+
+  # Source exported variables
+  cd "${DIR}/.." || exit
+  . cross.sh
 else
-  cd cross || exit
+  # Should be sourced to take effect
+  cd cross64 || exit
   DIR=$(pwd)
   export PREFIX="${DIR}/opt"
   export TARGET=x86_64-elf
   export PATH="$PREFIX/bin:$PATH"
+  cd ..
 fi
-- 
cgit v1.2.3