From 762b3acc1e198740a19ef89f47e32bf082c18c07 Mon Sep 17 00:00:00 2001 From: Vladimir Prus Date: Sat, 22 Jul 2006 06:22:12 +0000 Subject: [PATCH] Use USER_OPTIONS in darwin.jam. This unbreaks user's and settings. [SVN r34660] --- v2/tools/darwin.jam | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/v2/tools/darwin.jam b/v2/tools/darwin.jam index c13de782e..557424d5f 100644 --- a/v2/tools/darwin.jam +++ b/v2/tools/darwin.jam @@ -62,13 +62,13 @@ _ = " " ; actions link bind LIBRARIES { - $(CONFIG_COMMAND) -L"$(LINKPATH)" -o "$(<)" "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-SA) -l$(FINDLIBS-ST) -framework$(_)$(FRAMEWORK) $(OPTIONS) + $(CONFIG_COMMAND) -L"$(LINKPATH)" -o "$(<)" "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-SA) -l$(FINDLIBS-ST) -framework$(_)$(FRAMEWORK) $(OPTIONS) $(USER_OPTIONS) $(NEED_STRIP)strip $(NEED_STRIP)"$(<)" } actions link.dll bind LIBRARIES { - $(CONFIG_COMMAND) -dynamiclib -L"$(LINKPATH)" -o "$(<)" "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-SA) -l$(FINDLIBS-ST) -framework$(_)$(FRAMEWORK) $(OPTIONS) + $(CONFIG_COMMAND) -dynamiclib -L"$(LINKPATH)" -o "$(<)" "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-SA) -l$(FINDLIBS-ST) -framework$(_)$(FRAMEWORK) $(OPTIONS) $(USER_OPTIONS) } actions piecemeal archive