From 57407763ed55f355c65f60dbfef5dc143453427f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Hunold?= Date: Tue, 29 Oct 2013 17:19:33 +0000 Subject: [PATCH] Merge 84402 from ^/trunk ------------------------------------------------------------------------ r84402 | jhunold | 2013-05-21 14:23:20 +0200 (Di, 21 Mai 2013) | 4 lines Fix: cache file loading and saving must use native paths Fixes caching at least on Windows platform ------------------------------------------------------------------------ [SVN r86519] --- v2/build/config-cache.jam | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/v2/build/config-cache.jam b/v2/build/config-cache.jam index ff05fb6f8..5297dbb84 100644 --- a/v2/build/config-cache.jam +++ b/v2/build/config-cache.jam @@ -23,7 +23,8 @@ rule save ( ) { if $(.cache-file) { - local target = $(.cache-file) ; + local cache-file-native = [ path.native $(.cache-file) ] ; + local target = $(cache-file-native) ; local contents = "# Automatically generated by Boost.Build.\n# Do not edit.\n\nmodule config-cache {\n" ; for local var in $(.all-vars) { @@ -54,7 +55,7 @@ rule load ( cache-file ) { errors.error duplicate load of cache file ; } - cache-file = $(cache-file) ; + cache-file = [ path.native $(cache-file) ] ; if [ path.exists $(cache-file) ] && ! ( --reconfigure in [ modules.peek : ARGV ] ) { include $(cache-file) ;