diff options
| -rw-r--r-- | kconfig/llvm/compiler-rt.kconfig | 12 | ||||
| -rw-r--r-- | kconfig/toolchain.kconfig | 1 | ||||
| -rw-r--r-- | mk/llvm/compiler-rt/compiler-rt.mk | 9 |
3 files changed, 14 insertions, 8 deletions
diff --git a/kconfig/llvm/compiler-rt.kconfig b/kconfig/llvm/compiler-rt.kconfig index 0064c22..6d0f08f 100644 --- a/kconfig/llvm/compiler-rt.kconfig +++ b/kconfig/llvm/compiler-rt.kconfig @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2012 Abdoulaye Walsimou GAYE <awg@embtoolkit.org>. +# Copyright(C) 2012-2013 Abdoulaye Walsimou GAYE <awg@embtoolkit.org>. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,13 +26,16 @@ config EMTK_HAVE_COMPILER-RT bool default y - select EMBTK_COMPILER-RT_VERSION_GIT + select EMBTK_COMPILER-RT_VERSION_3_3 # -# compiler-rt version +# compiler-rt versions # +config EMBTK_COMPILER-RT_VERSION_3_3 + bool + config EMBTK_COMPILER-RT_VERSION_GIT - bool "Use compiler-rt git repository" + bool help Answer Y here if you want to build your toolchain based on compiler-rt sources from its GIT repository. @@ -62,6 +65,7 @@ config EMBTK_COMPILER-RT_REFSPEC # config EMBTK_COMPILER-RT_VERSION_STRING string + default "embtk-3.3" if EMBTK_COMPILER-RT_VERSION_3_3 default "git" if EMBTK_COMPILER-RT_VERSION_GIT diff --git a/kconfig/toolchain.kconfig b/kconfig/toolchain.kconfig index f65ee89..6fc5eff 100644 --- a/kconfig/toolchain.kconfig +++ b/kconfig/toolchain.kconfig @@ -121,6 +121,7 @@ comment "------------------------------------------" source kconfig/llvm/clang-llvm.kconfig source kconfig/llvm/llvm.kconfig source kconfig/llvm/clang.kconfig +source kconfig/llvm/compiler-rt.kconfig endif comment "------------------------------------------" diff --git a/mk/llvm/compiler-rt/compiler-rt.mk b/mk/llvm/compiler-rt/compiler-rt.mk index 08627c9..5443bb8 100644 --- a/mk/llvm/compiler-rt/compiler-rt.mk +++ b/mk/llvm/compiler-rt/compiler-rt.mk @@ -25,10 +25,11 @@ COMPILER-RT_NAME := compiler-rt COMPILER-RT_VERSION := $(call embtk_get_pkgversion,compiler-rt) -COMPILER-RT_SITE := http://llvm.org/releases/$(COMPILER-RT_VERSION) -COMPILER-RT_GIT_SITE := http://llvm.org/git/compiler-rt.git -COMPILER-RT_PACKAGE := compiler-rt-$(COMPILER-RT_VERSION).src.tar.gz -COMPILER-RT_SRC_DIR := $(embtk_toolsb)/compiler-rt-$(COMPILER-RT_VERSION).src +COMPILER-RT_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror +#COMPILER-RT_GIT_SITE := http://llvm.org/git/compiler-rt.git +COMPILER-RT_GIT_SITE := git://www.embtoolkit.org/compiler-rt.git +COMPILER-RT_PACKAGE := compiler-rt-$(COMPILER-RT_VERSION).tar.bz2 +COMPILER-RT_SRC_DIR := $(embtk_toolsb)/compiler-rt-$(COMPILER-RT_VERSION) COMPILER-RT_BUILD_DIR := $(call __embtk_pkg_srcdir,compiler-rt) __embtk_compiler-rt_cflags := $(TARGET_CFLAGS) |