From b9b5ffa1d912937c49afe9032fe6c88f02e2f970 Mon Sep 17 00:00:00 2001 From: Toon Knapen Date: Wed, 7 Jan 2004 14:00:49 +0000 Subject: [PATCH] removed Aix-Implib-Action and added '-G' flag to link shared libraries on AIX [SVN r21528] --- v1/allyourbase.jam | 2 +- v1/boost-base.jam | 15 --------------- v1/vacpp-tools.jam | 1 + 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/v1/allyourbase.jam b/v1/allyourbase.jam index 8306065d9..be3dc8459 100644 --- a/v1/allyourbase.jam +++ b/v1/allyourbase.jam @@ -317,7 +317,7 @@ else if $(UNIX) { case AIX : IMPLIB_FLAGS ?= -bI: ; - SUFDLL ?= .so .imp ; + SUFDLL ?= .so ; gLINK_VARIABLE(.so) = NEEDLIBS ; # shared libs should be added to the list of libs needed gLINK_VARIABLE(.imp) = NEEDIMPS ; # import libs are handled separately. gSHELL_LIBPATH = LIBPATH ; diff --git a/v1/boost-base.jam b/v1/boost-base.jam index ca3297149..5b01c02d6 100644 --- a/v1/boost-base.jam +++ b/v1/boost-base.jam @@ -218,26 +218,11 @@ rule Link-DLL if $(UNIX) { LINK_LIBPATH on $(<) = [ join $(gRUN_LD_LIBRARY_PATH($(<))) : $(SPLITPATH) ] ; - - if $(OS) = AIX - { - Aix-Implib-Action $(<) : $(>) ; - } } return [ .do-link $(<) : $(>) : DLL ] ; } -rule Aix-Implib-Action -{ - SPACE on $(<) = " " ; -} - -actions Aix-Implib-Action bind import-generator-script -{ - "$(BOOST_ROOT)/tools/build/v1/gen_aix_import_file.py" $(<[1]:BD=) $(>:D=) "-directory=$(<[1]:D)" -verbose=1 -} - # store the shell's PATH again, just in case someone uses PATH. # This also allows the user to customize the base path for running built # products from the command-line diff --git a/v1/vacpp-tools.jam b/v1/vacpp-tools.jam index ce017b4e0..e0810570d 100644 --- a/v1/vacpp-tools.jam +++ b/v1/vacpp-tools.jam @@ -39,6 +39,7 @@ flags vacpp C++FLAGS : -qfuncsect ; # libraries. Please note that this means that a static constructor # contained in such an object file won't be invoked. flags vacpp LINKFLAGS : -qtwolink ; +flags vacpp LINKFLAGS $(SHARED_TYPES) : -G ; flags vacpp CFLAGS off : -qNOOPTimize ; flags vacpp CFLAGS default : -O ;