From 014bb9e606724ef8f57d7a9f868699709dfff205 Mon Sep 17 00:00:00 2001 From: "K. Noel Belcourt" Date: Fri, 8 Feb 2008 17:53:50 +0000 Subject: [PATCH] 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. [SVN r43179] --- src/tools/intel-darwin.jam | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/tools/intel-darwin.jam b/src/tools/intel-darwin.jam index 6d362030b..85a7502ca 100644 --- a/src/tools/intel-darwin.jam +++ b/src/tools/intel-darwin.jam @@ -85,14 +85,7 @@ rule init ( version ? : command * : options * ) local major = $(m) ; - if $(major) = "8" { - flags intel-darwin.compile OPTIONS $(condition)/off : -Ob0 ; - flags intel-darwin.compile OPTIONS $(condition)/on : -Ob1 ; - flags intel-darwin.compile OPTIONS $(condition)/full : -Ob2 ; - flags intel-darwin.link OPTIONS $(condition)/static : -static -static-libcxa -lstdc++ -lpthread ; - flags intel-darwin.link OPTIONS $(condition)/shared : -shared-libcxa -lstdc++ -lpthread ; - } - else if $(major) = "9" { + if $(major) = "9" { flags intel-darwin.compile OPTIONS $(condition)/off : -Ob0 ; flags intel-darwin.compile OPTIONS $(condition)/on : -Ob1 ; flags intel-darwin.compile OPTIONS $(condition)/full : -Ob2 ; @@ -207,5 +200,5 @@ actions link bind LIBRARIES 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) }