diff options
| -rw-r--r-- | toolchain/Makefile | 19 | ||||
| -rw-r--r-- | toolchain/gcc/Makefile | 2 |
2 files changed, 13 insertions, 8 deletions
diff --git a/toolchain/Makefile b/toolchain/Makefile index 64cd8b1db..819ad405f 100644 --- a/toolchain/Makefile +++ b/toolchain/Makefile @@ -1,6 +1,6 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -# + # Steps to build toolchains # 1) build and install binutils # 2) build and install mpfr, mpc, libelf and gmp @@ -15,7 +15,8 @@ include $(ADK_TOPDIR)/rules.mk -TARGETS:=binutils gmp mpfr mpc libelf gcc gdb +TARGETS:=binutils gmp mpfr mpc libelf gcc + ifeq ($(ADK_TARGET_LIB_GLIBC),y) TARGETS+=glibc CLIB:=glibc @@ -32,8 +33,16 @@ ifeq ($(ADK_TARGET_LIB_MUSL),y) TARGETS+=musl CLIB:=musl endif + ifeq ($(ADK_TARGET_BINFMT_FLAT),y) TARGETS+=elf2flt +ELF2FLT:=elf2flt-install +endif + +# disable gdb for arc +ifneq ($(ADK_LINUX_ARC),y) +TARGETS+=gdb +GDB:=gdb-install endif DOWNLOAD:=kernel-headers-download $(patsubst %,%-download,$(TARGETS)) @@ -51,11 +60,7 @@ $(CLIB)-prepare: gcc-prepare kernel-headers-prepare gcc-configure: $(CLIB)-prepare $(CLIB)-compile: gcc-configure gcc-compile: $(CLIB)-install -ifeq ($(ADK_TARGET_BINFMT_FLAT),y) -$(CLIB)-fixup: gcc-install gdb-install elf2flt-install -else -$(CLIB)-fixup: gcc-install gdb-install -endif +$(CLIB)-fixup: gcc-install $(GDB) $(ELF2FLT) %-download: $(TRACE) toolchain/$(patsubst %-download,%,$@)/download diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 59b2d4366..6a5936604 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -44,7 +44,7 @@ else GCC_CONFOPTS+= --disable-tls --disable-threads --disable-libatomic endif -ifneq ($(ADK_LINUX_AARCH64)$(ADK_LINUX_ALPHA)$(ADK_LINUX_BFIN)$(ADK_LINUX_XTENSA)$(ADK_LINUX_M68K),y) +ifneq ($(ADK_LINUX_AARCH64)$(ADK_LINUX_ALPHA)$(ADK_LINUX_ARC)$(ADK_LINUX_BFIN)$(ADK_LINUX_XTENSA)$(ADK_LINUX_M68K),y) GCC_FINAL_CONFOPTS+= --enable-cxx-flags='$(TARGET_CXXFLAGS)' endif |