diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-05 07:58:08 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-05 07:58:08 +0100 |
| commit | 8abe85c5a6920e3cea42c75193d22669285b84c7 (patch) | |
| tree | 6985f1e5342581bccc8820424228195604dab923 /toolchain | |
| parent | b43e909de4cbeb1393db9116296b4683d0ae25d7 (diff) | |
| parent | c5ad4bdcdb9f3e0591e8943fe8b5302b76637b71 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/Config.in | 16 | ||||
| -rw-r--r-- | toolchain/Makefile | 10 | ||||
| -rw-r--r-- | toolchain/gcc/Makefile | 8 |
3 files changed, 8 insertions, 26 deletions
diff --git a/toolchain/Config.in b/toolchain/Config.in index 6f51c2367..d6a578233 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -7,24 +7,12 @@ menu "Toolchain settings" config ADK_TOOLCHAIN_GDB prompt "Enable building of the GNU debugger" boolean - default y if !ADK_TARGET_SYSTEM_ATMEL_NGW100 - depends on !ADK_TARGET_SYSTEM_ATMEL_NGW100 + default y config ADK_TOOLCHAIN_GCC_CXX prompt "Enable building of G++ (C++ language support in GCC)" boolean - default y if !ADK_TARGET_WITH_MULTILIB - -#config ADK_TOOLCHAIN_GCC_JAVA -# prompt "Enable building of GCJ (Java language support in GCC)" -# boolean -# select ADK_PACKAGE_LIBGCJ -# default n -# -#config ADK_TOOLCHAIN_GCC_OBJC -# prompt "Enable building of Objective C compiler" -# boolean -# default n + default y config ADK_TOOLCHAIN_GCC_SSP prompt "Enable Stack Smashing Protection in GCC" 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 $@ |