From ef5f69c03212afc724edad422e6d5bd6b6f7fa46 Mon Sep 17 00:00:00 2001 From: Vladimir Prus Date: Mon, 14 Dec 2009 06:50:05 +0000 Subject: [PATCH] Don't generate empty -F if framework is specified without path. Patch from Sohail Somani. [SVN r58371] --- v2/tools/darwin.jam | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/v2/tools/darwin.jam b/v2/tools/darwin.jam index 507201e79..a040d9c8a 100644 --- a/v2/tools/darwin.jam +++ b/v2/tools/darwin.jam @@ -497,12 +497,15 @@ local rule prepare-framework-path ( target + ) # The -F option specifies the directories where a framework # is searched for. So, if we find feature # with some path, we need to generate property -F option. - local framework-path = [ on $(target) return $(FRAMEWORK:D) ] ; + local framework-paths = [ on $(target) return $(FRAMEWORK:D) ] ; # Be sure to generate no -F if there's no path. - if $(framework-path) != "" + for local framework-path in $(framework-paths) { - FRAMEWORK_PATH on $(target) += -F$(framework-path) ; + if $(framework-path) != "" + { + FRAMEWORK_PATH on $(target) += -F$(framework-path) ; + } } }