From: Peter Korsgaard <peter@korsgaard.com>
Date: Tue, 1 Dec 2015 22:22:51 +0000 (+0100)
Subject: Merge branch 'next'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cc257ee493bbf3261417908684dbff834d853ae6;p=buildroot.git

Merge branch 'next'

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---

cc257ee493bbf3261417908684dbff834d853ae6
diff --cc package/boost/boost.mk
index d91baf1175,efc0020fe2..178f7b8738
--- a/package/boost/boost.mk
+++ b/package/boost/boost.mk
@@@ -89,10 -89,10 +89,14 @@@ BOOST_OPTS += toolset=gcc 
  	     abi=$(BOOST_ABI) \
  	     variant=$(if $(BR2_ENABLE_DEBUG),debug,release)
  
 +ifeq ($(BR2_sparc64),y)
 +BOOST_OPTS += architecture=sparc instruction-set=ultrasparc
 +endif
 +
+ ifeq ($(BR2_sparc),y)
+ BOOST_OPTS += architecture=sparc instruction-set=v8
+ endif
+ 
  # By default, Boost build and installs both the shared and static
  # variants. Override that if we want static only or shared only.
  ifeq ($(BR2_STATIC_LIBS),y)