[tyndur-devel] [PATCH] build: Tool-Pfade nach Makefile.local

[Andreas Freimuth <m.nemo@xxxxxxx>]

! buildmk.sh: Compilerprefix und Unterschiede zwischen den Architekturen
  führen zu Veränderungen im Root-Makefile

Signed-off-by: Andreas Freimuth <m.nemo@xxxxxxx>
---
 Makefile   |    6 +++---
 buildmk.sh |    9 ++++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index a99b53e..74f0b24 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 -include Makefile.local
 
-CC=gcc -m32 -g -c -fno-stack-protector -nostdinc -fno-leading-underscore -fno-omit-frame-pointer -Wall -Werror -Wstrict-prototypes -fno-strict-aliasing -O2 -fno-builtin -I .   
-CPP=g++ -m32 -g -c -fno-stack-protector -fno-leading-underscore -fno-omit-frame-pointer -Wall -fno-strict-aliasing -nostdlib -fno-builtin -fno-rtti -fno-exceptions -fno-use-cxa-atexit -O0 
+CC=$(CC_BINARY)   
+CPP=$(CPP_BINARY) 
 PPC=$(PPC_BINARY) -n -Cn -CX -Ttyndur  -Fu../lib/units -Fu../units
 
 ASM_ELF=nasm -felf -O99 
@@ -9,7 +9,7 @@ ASM_BIN=nasm -fbin -O99
 
 BUILD_DIR=$(BUILD_ROOT)
 
-AS=as -32
+AS=$(AS_BINARY)
 
 all:
 	$(MAKE) --no-print-directory -s makefiles
diff --git a/buildmk.sh b/buildmk.sh
index 725728a..f5dd580 100644
--- a/buildmk.sh
+++ b/buildmk.sh
@@ -85,6 +85,9 @@ fi
 if [ "$LOST_BUILDMK_ROOT" == "`pwd`" ]; then
   cat <<EOF > Makefile.local
 BUILD_ROOT=$LOST_BUILDMK_ROOT/build/output
+AS_BINARY=$LOST_TOOLS_AS
+CC_BINARY=$LOST_TOOLS_GCC
+CPP_BINARY=$LOST_TOOLS_GPP
 PPC_BINARY=$LOST_TOOLS_PPC
 EOF
 
@@ -106,8 +109,8 @@ fi
 
 cat <<EOF >> Makefile
 
-CC=$LOST_TOOLS_GCC $CC_FLAGS $INCLUDES $CC_FLAGS_APPEND
-CPP=$LOST_TOOLS_GPP $INCLUDES
+CC=\$(CC_BINARY) $CC_FLAGS $INCLUDES $CC_FLAGS_APPEND
+CPP=\$(CPP_BINARY) $INCLUDES
 PPC=\$(PPC_BINARY) -n -Cn -CX -Ttyndur $FPCINCLUDES -Fu../lib/units -Fu../units
 
 ASM_ELF=nasm -felf -O99 $NASMINCLUDES
@@ -115,7 +118,7 @@ ASM_BIN=nasm -fbin -O99
 
 BUILD_DIR=`pwd | sed s#^$LOST_BUILDMK_ROOT#\$\(BUILD_ROOT\)#`
 
-AS=$LOST_TOOLS_AS
+AS=\$(AS_BINARY)
 
 all:
 EOF
-- 
1.7.3.4