diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-04-17 04:45:30 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2012-04-25 09:00:42 +0200 |
| commit | 2b563d481fbeeabc1c904e2398ec99a453faf6f2 (patch) | |
| tree | d9b48b59610f605bc062721b9cd96e91022aa086 | |
| parent | 01df5af1db098cf399b3056dec2b7ab37bd03968 (diff) | |
gcc: move version/snap variables to gcc-uclibc-4.x.mk
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
| -rw-r--r-- | toolchain/gcc/Makefile.in | 6 | ||||
| -rw-r--r-- | toolchain/gcc/gcc-uclibc-4.x.mk | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/toolchain/gcc/Makefile.in b/toolchain/gcc/Makefile.in index c3f457627..3e82a324b 100644 --- a/toolchain/gcc/Makefile.in +++ b/toolchain/gcc/Makefile.in @@ -3,15 +3,9 @@ # So include them in this file and arrange to include it # soon after invoking make from the top level. -GCC_VERSION:=$(call qstrip,$(BR2_GCC_VERSION)) TARGET_OPTIMIZATION:=$(call qstrip,$(BR2_TARGET_OPTIMIZATION)) EXTRA_GCC_CONFIG_OPTIONS:=$(call qstrip,$(BR2_EXTRA_GCC_CONFIG_OPTIONS)) -ifeq ($(call qstrip,$(BR2_GCC_VERSION_SNAP)),y) -GCC_SNAP_DATE:=$(call qstrip,$(BR2_GCC_SNAP_DATE)) -else -GCC_SNAP_DATE:= -endif ifeq ($(BR2_SOFT_FLOAT),y) SOFT_FLOAT_CONFIG_OPTION:=--with-float=soft diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk index 212660c7d..3d0228d11 100644 --- a/toolchain/gcc/gcc-uclibc-4.x.mk +++ b/toolchain/gcc/gcc-uclibc-4.x.mk @@ -17,6 +17,14 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +GCC_VERSION:=$(call qstrip,$(BR2_GCC_VERSION)) + +ifeq ($(BR2_GCC_VERSION_SNAP),y) +GCC_SNAP_DATE:=$(call qstrip,$(BR2_GCC_SNAP_DATE)) +else +GCC_SNAP_DATE:= +endif + ifneq ($(GCC_SNAP_DATE),) GCC_SITE:=ftp://sources.redhat.com/pub/gcc/snapshots/$(GCC_VERSION) else ifeq ($(findstring avr32,$(GCC_VERSION)),avr32) |