From 7cb8b443ecace2e482c3e1082bbd3bb2f31946fc Mon Sep 17 00:00:00 2001 From: Vladimir Prus Date: Thu, 18 May 2006 10:37:52 +0000 Subject: [PATCH] Don't pass -s on Darwin. [SVN r33998] --- v2/tools/gcc.jam | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/v2/tools/gcc.jam b/v2/tools/gcc.jam index db739eae1..a0b2b113c 100644 --- a/v2/tools/gcc.jam +++ b/v2/tools/gcc.jam @@ -333,11 +333,10 @@ rule init-link-flags ( toolset linker condition ) } case darwin : { - # we can't pass -s to ld unless we also pass -static - # so we removed -s completly from OPTIONS and add it - # to ST_OPTIONS - flags $(toolset).link ST_OPTIONS $(condition)/off : -s - : unchecked ; + # On Darwin, the -s option to ld does not work unless we pass + # -static, and passing -static unconditionally is a bad idea. + # So, don't pass -s at all, darwin.jam will use separate 'strip' + # invocation. flags $(toolset).link RPATH $(condition) : : unchecked ; flags $(toolset).link RPATH_LINK $(condition) : : unchecked ; }