From dfc079fed092f525207a72c7331a6a76ad8ac96e Mon Sep 17 00:00:00 2001 From: Vladimir Prus Date: Mon, 13 Feb 2006 10:51:49 +0000 Subject: [PATCH] More fixes: - Resolve ambiguity between builtin.prebuilt and tru64.prebuilt. - Remove archive files before creating. This is like is done for gcc, and removes "creating foobar.a" warnings as well. [SVN r32886] --- src/tools/tru64.jam | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/tools/tru64.jam b/src/tools/tru64.jam index 80332ab44..96726d4e4 100644 --- a/src/tools/tru64.jam +++ b/src/tools/tru64.jam @@ -36,13 +36,10 @@ feature.extend c++abi : cxxarm ; # Inherit from Unix toolset to get library ordering magic. toolset.inherit tru64 : unix ; -#toolset.inherit-generators tru64 : unix : unix.link unix.link.dll ; - generators.override builtin.lib-generator : tru64.prebuilt ; +generators.override tru64.prebuilt : builtin.prebuilt ; generators.override tru64.searched-lib-generator : searched-lib-generator ; -#feature.subfeature toolset tru64 : version ; - rule init ( version ? : command * : options * ) { @@ -151,7 +148,10 @@ actions compile.c++ $(CONFIG_COMMAND) -c -std strict_ansi -nopure_cname -noimplicit_include -timplicit_local -ptr "$(<[1]:D)/cxx_repository" -msg_display_number -msg_disable 186,450,1115 $(OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -o "$(<)" "$(>)" } +# Always create archive from scratch. See the gcc toolet for rationale. +RM = [ common.rm-command ] ; actions updated together piecemeal archive { - ar -ru $(<) $(>) + $(RM) "$(<)" + ar rc $(<) $(>) }