boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-16 13:22:11 +00:00
Code Issues Projects Releases Wiki Activity

Stop generating illegal argumentless -F option in the link line.

Browse Source 
[SVN r35402]
This commit is contained in:
Dave Abrahams
2006-09-28 22:27:50 +00:00
parent de04c65ce9
commit 320031246c
1 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
v2/tools/darwin.jam
View File

@@ -60,15 +60,40 @@ flags darwin.link FRAMEWORK <framework> ;
_ = " " ;
# set up the -F option to include the paths to any frameworks used.
local rule prepare-framework-path ( target + )
{
local framework-path = [ on $(target) return $(FRAMEWORK:D) ] ;
if $(framework-path)
{
FRAMEWORK_PATH on $(target) += -F$(framework-path) ;
}
else
{
FRAMEWORK_PATH on $(target) = ;
}
}
rule link
{
prepare-framework-path $(<) ;
}
actions link bind LIBRARIES
{
$(CONFIG_COMMAND) -L"$(LINKPATH)" -o "$(<)" "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-SA) -l$(FINDLIBS-ST) -F$(FRAMEWORK:D) -framework$(_)$(FRAMEWORK:D=) $(OPTIONS) $(USER_OPTIONS)
$(CONFIG_COMMAND) -L"$(LINKPATH)" -o "$(<)" "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-SA) -l$(FINDLIBS-ST) $(FRAMEWORK_PATH) -framework$(_)$(FRAMEWORK:D=) $(OPTIONS) $(USER_OPTIONS)
$(NEED_STRIP)strip $(NEED_STRIP)"$(<)"
}
rule link.dll
{
prepare-framework-path $(<) ;
}
actions link.dll bind LIBRARIES
{
$(CONFIG_COMMAND) -dynamiclib -L"$(LINKPATH)" -o "$(<)" "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-SA) -l$(FINDLIBS-ST) -F$(FRAMEWORK:D) -framework$(_)$(FRAMEWORK:D=) $(OPTIONS) $(USER_OPTIONS)
$(CONFIG_COMMAND) -dynamiclib -L"$(LINKPATH)" -o "$(<)" "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-SA) -l$(FINDLIBS-ST) $(FRAMEWORK_PATH) -framework$(_)$(FRAMEWORK:D=) $(OPTIONS) $(USER_OPTIONS)
}
actions piecemeal archive