From f38afdc9eed51736fe8277dc8cdbe7e615003ba4 Mon Sep 17 00:00:00 2001 From: NicJA Date: Sat, 7 Feb 2015 00:48:12 +0000 Subject: [PATCH] set the correct compiler depending on if we are doing a hosted or native build git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@50045 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- bootstrap/mmakefile.src | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/bootstrap/mmakefile.src b/bootstrap/mmakefile.src index 6b980c7cc2..fa92b9cc3d 100644 --- a/bootstrap/mmakefile.src +++ b/bootstrap/mmakefile.src @@ -5,15 +5,20 @@ include $(TOP)/config/make.cfg FILES := elfloader USER_INCLUDES := -I $(SRCDIR)/$(CURDIR)/include -I $(GENINCDIR) +ifeq ($(FLAVOUR),emulation) +BOOTSTRAP_COMPILER:=host +else +BOOTSTRAP_COMPILER:=kernel +endif %build_linklib mmake=linklibs-bootstrap libname=bootstrap files="$(FILES)" \ - compiler=kernel libdir=$(GENDIR)/lib + compiler=$(BOOTSTRAP_COMPILER) libdir=$(GENDIR)/lib # linklibs-bootstrap32 target is used by x86-64 bootstrap which runs in 32-bit mode USER_CFLAGS := -m32 -DELF_64BIT %build_linklib mmake=linklibs-bootstrap32 libname=bootstrap files="$(FILES)" \ - compiler=kernel objdir=$(GENDIR)/$(CURDIR)/32bit libdir=$(GENDIR)/lib32 + compiler=$(BOOTSTRAP_COMPILER) objdir=$(GENDIR)/$(CURDIR)/32bit libdir=$(GENDIR)/lib32 %common -- 2.11.4.GIT