[Boost-commit] svn:boost r43179 - trunk/tools/build/v2/tools

From: kbelco_at_[hidden]
Date: 2008-02-08 12:53:51

Author: noel_belcourt
Date: 2008-02-08 12:53:50 EST (Fri, 08 Feb 2008)
New Revision: 43179
URL: http://svn.boost.org/trac/boost/changeset/43179

Log:
I've added the -single_module option to the intel-darwin.link.dll
action to fix this linker error when linking dylibs:

ld: common symbols not allowed with MH_DYLIB output format with the -multi_module option
boost/bin.v2/libs/system/build/intel-darwin-9.1/debug/macosx-version-10.4/error_code.o 
  definition of common __ZGVZNK5boost6system14error_category7messageEiE1s (size 16)
boost/bin.v2/libs/system/build/intel-darwin-9.1/debug/macosx-version-10.4/error_code.o 
  definition of common __ZZNK5boost6system14error_category7messageEiE1s (size 16)

though I would note that the common symbols problem occurs in a number of
other libraries (test, graph, spirit, ...) as well.

Text files modified: 
   trunk/tools/build/v2/tools/intel-darwin.jam |    11 ++---------                             
   1 files changed, 2 insertions(+), 9 deletions(-)

Modified: trunk/tools/build/v2/tools/intel-darwin.jam
==============================================================================
--- trunk/tools/build/v2/tools/intel-darwin.jam	(original)
+++ trunk/tools/build/v2/tools/intel-darwin.jam	2008-02-08 12:53:50 EST (Fri, 08 Feb 2008)
@@ -85,14 +85,7 @@
 
     local major = $(m) ;
     
-    if $(major) = "8" {
-      flags intel-darwin.compile OPTIONS $(condition)/<inlining>off : -Ob0 ;
-      flags intel-darwin.compile OPTIONS $(condition)/<inlining>on : -Ob1  ;
-      flags intel-darwin.compile OPTIONS $(condition)/<inlining>full : -Ob2  ;
-      flags intel-darwin.link OPTIONS $(condition)/<runtime-link>static : -static -static-libcxa -lstdc++ -lpthread ;
-      flags intel-darwin.link OPTIONS $(condition)/<runtime-link>shared : -shared-libcxa -lstdc++ -lpthread ;
-    }
-    else if $(major) = "9" {
+    if $(major) = "9" {
       flags intel-darwin.compile OPTIONS $(condition)/<inlining>off : -Ob0 ;
       flags intel-darwin.compile OPTIONS $(condition)/<inlining>on : -Ob1  ;
       flags intel-darwin.compile OPTIONS $(condition)/<inlining>full : -Ob2  ;
@@ -207,5 +200,5 @@
 
 actions link.dll bind LIBRARIES
 {
-    "$(CONFIG_COMMAND)" $(USER_OPTIONS) -L"$(LINKPATH)" -o "$(<)" -dynamiclib -install_name "$(<[1]:D=)" "$(>)"  "$(LIBRARIES)" -l$(FINDLIBS-SA) -l$(FINDLIBS-ST) $(OPTIONS)
+    "$(CONFIG_COMMAND)" $(USER_OPTIONS) -L"$(LINKPATH)" -o "$(<)" -single_module -dynamiclib -install_name "$(<[1]:D=)" "$(>)"  "$(LIBRARIES)" -l$(FINDLIBS-SA) -l$(FINDLIBS-ST) $(OPTIONS)
 }