Subject: [Boost-commit] svn:boost r80685 - trunk/tools/build/v2/tools
From: grafikrobot_at_[hidden]
Date: 2012-09-23 22:29:51
Author: grafik
Date: 2012-09-23 22:29:50 EDT (Sun, 23 Sep 2012)
New Revision: 80685
URL: http://svn.boost.org/trac/boost/changeset/80685
Log:
Add armv7 and the new armv7s. Change the -arch option for xcode to allow matching the instructions-set if specified to make it easier to build from within Xcode.
Text files modified:
trunk/tools/build/v2/tools/builtin.jam | 1 +
trunk/tools/build/v2/tools/darwin.jam | 13 +++++++++----
2 files changed, 10 insertions(+), 4 deletions(-)
Modified: trunk/tools/build/v2/tools/builtin.jam
==============================================================================
--- trunk/tools/build/v2/tools/builtin.jam (original)
+++ trunk/tools/build/v2/tools/builtin.jam 2012-09-23 22:29:50 EDT (Sun, 23 Sep 2012)
@@ -300,6 +300,7 @@
# Advanced RISC Machines
armv2 armv2a armv3 armv3m armv4 armv4t armv5 armv5t armv5te armv6 armv6j iwmmxt ep9312
+ armv7 armv7s
: propagated optional ;
Modified: trunk/tools/build/v2/tools/darwin.jam
==============================================================================
--- trunk/tools/build/v2/tools/darwin.jam (original)
+++ trunk/tools/build/v2/tools/darwin.jam 2012-09-23 22:29:50 EDT (Sun, 23 Sep 2012)
@@ -35,6 +35,8 @@
#############################################################################
+_ = " " ;
+
if [ MATCH (--debug-configuration) : [ modules.peek : ARGV ] ]
{
.debug-configuration = true ;
@@ -376,6 +378,7 @@
{
local ps = [ property-set.create $(properties) ] ;
local arch = [ $(ps).get <architecture> ] ;
+ local instruction-set = [ $(ps).get <instruction-set> ] ;
local address-model = [ $(ps).get <address-model> ] ;
local osx-version = [ $(ps).get <macosx-version> ] ;
local gcc-version = [ $(ps).get <toolset-darwin:version> ] ;
@@ -454,8 +457,12 @@
case arm :
{
- options = -arch armv6 ;
- }
+ if $(instruction-set) {
+ options = -arch$(_)$(instruction-set) ;
+ } else {
+ options = -arch arm ;
+ }
+ }
}
if $(options)
@@ -526,8 +533,6 @@
# uncomment to see what libtool is doing under the hood
#~ flags darwin.link.dll OPTIONS : -Wl,-v ;
-_ = " " ;
-
# set up the -F option to include the paths to any frameworks used.
local rule prepare-framework-path ( target + )
{