[Boost-commit] svn:boost r86516 - in branches/release: . tools tools/build tools/build/v2 tools/build/v2/engine

Subject: [Boost-commit] svn:boost r86516 - in branches/release: . tools tools/build tools/build/v2 tools/build/v2/engine
From: eric_at_[hidden]
Date: 2013-10-29 12:53:08

Author: eric_niebler
Date: 2013-10-29 12:53:08 EDT (Tue, 29 Oct 2013)
New Revision: 86516
URL: http://svn.boost.org/trac/boost/changeset/86516

Log:
merge [86460] from trunk, fix bootstrap on mingw

Properties modified: 
   branches/release/   (props changed)
   branches/release/tools/   (props changed)
   branches/release/tools/build/   (props changed)
   branches/release/tools/build/v2/   (props changed)
Text files modified: 
   branches/release/tools/build/v2/engine/build.jam |     4 ++--                                    
   branches/release/tools/build/v2/engine/build.sh  |     6 +++---                                  
   2 files changed, 5 insertions(+), 5 deletions(-)

Modified: branches/release/tools/build/v2/engine/build.jam
==============================================================================
--- branches/release/tools/build/v2/engine/build.jam	Tue Oct 29 12:48:05 2013	(r86515)
+++ branches/release/tools/build/v2/engine/build.jam	2013-10-29 12:53:08 EDT (Tue, 29 Oct 2013)	(r86516)
@@ -489,8 +489,8 @@
     make.c make1.c mem.c object.c option.c output.c parse.c pathsys.c regexp.c
     rules.c scan.c search.c subst.c w32_getreg.c timestamp.c variable.c
     modules.c strings.c filesys.c builtins.c class.c cwd.c native.c md5.c
-    modules/set.c modules/path.c modules/regex.c modules/property-set.c
-    modules/sequence.c modules/order.c ;
+    [ .path modules set.c ] [ .path modules path.c ] [ .path modules regex.c ]
+    [ .path modules property-set.c ] [ .path modules sequence.c ] [ .path modules order.c ] ;
 if $(OS) = NT
 {
     jam.source += execnt.c filent.c pathnt.c ;

Modified: branches/release/tools/build/v2/engine/build.sh
==============================================================================
--- branches/release/tools/build/v2/engine/build.sh	Tue Oct 29 12:48:05 2013	(r86515)
+++ branches/release/tools/build/v2/engine/build.sh	2013-10-29 12:53:08 EDT (Tue, 29 Oct 2013)	(r86516)
@@ -247,18 +247,18 @@
 BJAM_SOURCES="\
  command.c compile.c constants.c debug.c execcmd.c frames.c function.c glob.c\
  hash.c hdrmacro.c headers.c jam.c jambase.c jamgram.c lists.c make.c make1.c\
- object.c option.c output.c parse.c pathsys.c pathunix.c regexp.c rules.c\
+ object.c option.c output.c parse.c pathsys.c regexp.c rules.c\
  scan.c search.c subst.c timestamp.c variable.c modules.c strings.c filesys.c\
  builtins.c class.c cwd.c native.c md5.c w32_getreg.c modules/set.c\
  modules/path.c modules/regex.c modules/property-set.c modules/sequence.c\
  modules/order.c"
 case $BOOST_JAM_TOOLSET in
     mingw)
-    BJAM_SOURCES="${BJAM_SOURCES} execnt.c filent.c"
+    BJAM_SOURCES="${BJAM_SOURCES} execnt.c filent.c pathnt.c"
     ;;
 
     *)
-    BJAM_SOURCES="${BJAM_SOURCES} execunix.c fileunix.c"
+    BJAM_SOURCES="${BJAM_SOURCES} execunix.c fileunix.c pathunix.c"
     ;;
 esac