From b3918387299c82d4436434ae6544df48db7efa1f Mon Sep 17 00:00:00 2001 From: Vladimir Prus Date: Thu, 7 Feb 2008 11:04:30 +0000 Subject: [PATCH] Fix with no path. Patch from Jon Olsson. [SVN r43152] --- v2/tools/darwin.jam | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/v2/tools/darwin.jam b/v2/tools/darwin.jam index 9d204bd01..5475ff86d 100644 --- a/v2/tools/darwin.jam +++ b/v2/tools/darwin.jam @@ -171,9 +171,17 @@ _ = " " ; # set up the -F option to include the paths to any frameworks used. local rule prepare-framework-path ( target + ) { + # The -framework option only takes basename of the framework. + # 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) ] ; - - FRAMEWORK_PATH on $(target) += -F$(framework-path) ; + + # Be sure to generate no -F if there's no path. + if $(framework-path) != "" + { + FRAMEWORK_PATH on $(target) += -F$(framework-path) ; + } } rule link