summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-02-04 10:36:09 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-02-04 10:36:09 +0100
commit44e2c72df2e4ad93712c2f8c31862633bba15d9e (patch)
tree1390e7b0d3a47576996e19b8fcb909595c302297
parent0aa497e50756d4e0c73d66cbd5de4a5e2234d35c (diff)
unbreak toolchain building
-rw-r--r--toolchain/Makefile10
-rw-r--r--toolchain/gcc/Makefile8
2 files changed, 6 insertions, 12 deletions
diff --git a/toolchain/Makefile b/toolchain/Makefile
index be4f38e07..b61133b28 100644
--- a/toolchain/Makefile
+++ b/toolchain/Makefile
@@ -4,12 +4,14 @@
# Steps to build toolchains
# 1) build and install binutils
# 2) build and install mpfr, mpc, libelf and gmp
-# 3) build and install gcc c compiler
+# 3) build and install minimal gcc c compiler
# 4) install kernel-headers
# 5) install libc headers
-# 6) build and install full gcc
+# 6) build and install initial static gcc
# 7) build and install full libc
-# 8) build and install gdb debugger
+# 8) build and install full shared gcc
+# 9) rebuild and install full libc (in case of musl)
+# 10) build and install gdb debugger
include $(TOPDIR)/rules.mk
@@ -50,7 +52,7 @@ gcc-configure: $(LIBC)-prepare
$(LIBC)-compile: gcc-configure
gcc-compile: $(LIBC)-install
ifeq ($(ADK_TOOLCHAIN_GDB),y)
-$(LIBC)-fixup: gdb-install
+$(LIBC)-fixup: gcc-install gdb-install
else
$(LIBC)-fixup: gcc-install
endif
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 4044ead03..6328585da 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -95,13 +95,6 @@ LANGUAGES:=c
ifeq ($(ADK_TOOLCHAIN_GCC_CXX),y)
LANGUAGES:=${LANGUAGES},c++
endif
-ifeq ($(ADK_TOOLCHAIN_GCC_JAVA),y)
-LANGUAGES:=${LANGUAGES},java
-GCC_CONFOPTS+= --enable-java-home
-endif
-ifeq ($(ADK_TOOLCHAIN_GCC_ADA),y)
-LANGUAGES:=${LANGUAGES},ada
-endif
include ${TOPDIR}/mk/buildhlp.mk
@@ -145,7 +138,6 @@ $(GCC_BUILD_DIR_INITIAL)/.configured:
--enable-languages=c \
--disable-shared \
--disable-threads \
- --with-newlib \
--with-sysroot=$(STAGING_TARGET_DIR)
touch $@