github/AROS-v0
1
0
Fork 0
mirror of https://github.com/deadw00d/AROS.git synced 2025-10-26 21:18:42 +00:00
Code Issues Releases Wiki Activity

revert changes, and use the kernel compiler

Browse Source 
git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@50131 fb15a70f-31f2-0310-bbcc-cdcc74a49acc
This commit is contained in:
NicJA
2015-02-25 00:35:29 +00:00
parent f961a6be30
commit d33f4331e6
4 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/all-hosted/bootstrap/mmakefile.src
View File

@ -19,10 +19,8 @@ USER_INCLUDES := -I$(SRCDIR)/arch/all-$(ARCH)/kernel -I$(GENINCDIR) -isystem $(S
#MM kernel-bootstrap-hosted: linklibs-bootstrap linklibs-arossupport
BD_LINK := $(HOST_CC) $(KERNEL_LDFLAGS)
%build_prog mmake=kernel-bootstrap-hosted \
progname=$(PROG)$(EXE_SUFFIX) targetdir=$(AROSARCHDIR) \
files=$(FILES) compiler=host uselibs="bootstrap"
files=$(FILES) compiler=kernel uselibs="bootstrap"
%common

2
arch/all-linux/bootstrap/mmakefile.src
View File

@ -7,6 +7,6 @@ USER_INCLUDES := -I$(SRCDIR)/arch/all-hosted/bootstrap \
%build_archspecific \
mainmmake=kernel-bootstrap-hosted maindir=arch/all-hosted/bootstrap arch=linux \
files=$(FILES) compiler=host
files=$(FILES) compiler=kernel
%common

2
arch/all-unix/bootstrap/mmakefile.src
View File

@ -13,6 +13,6 @@ USER_CFLAGS := -DARCH=\"$(AROS_DIR_ARCH)\"
%build_archspecific \
mainmmake=kernel-bootstrap-hosted maindir=arch/all-hosted/bootstrap arch=unix \
files=$(FILES) compiler=host
files=$(FILES) compiler=kernel
%common

9
bootstrap/mmakefile.src
View File

@ -5,20 +5,15 @@ 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=$(BOOTSTRAP_COMPILER) libdir=$(GENDIR)/lib
compiler=kernel 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=$(BOOTSTRAP_COMPILER) objdir=$(GENDIR)/$(CURDIR)/32bit libdir=$(GENDIR)/lib32
compiler=kernel objdir=$(GENDIR)/$(CURDIR)/32bit libdir=$(GENDIR)/lib32
%common