From 26375482e03cf51adb18683eb530d2abc6ddcfde Mon Sep 17 00:00:00 2001 From: Vladimir Prus Date: Thu, 8 May 2003 11:06:30 +0000 Subject: [PATCH] Improve testing. * new/builtin.jam: Register RSP and IMPORT_LIB types, and associated generators unconditionally, since the previous behaviour made using the same dir for testing from linux and windows inconvenient: "using msvc" was causing errors on linux because RSP type was not defined. [SVN r18362] --- src/tools/builtin.jam | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/tools/builtin.jam b/src/tools/builtin.jam index fb03e6035..9c9c43578 100644 --- a/src/tools/builtin.jam +++ b/src/tools/builtin.jam @@ -222,7 +222,7 @@ declare-type : OBJ : o : : main ; declare-type NT CYGWIN : STATIC_LIB : lib : LIB : main ; declare-type : STATIC_LIB : a : LIB : main ; -declare-type NT CYGWIN : IMPORT_LIB : : STATIC_LIB : main ; +declare-type : IMPORT_LIB : : STATIC_LIB : main ; type.set-generated-target-suffix IMPORT_LIB : : lib ; declare-type NT CYGWIN : SHARED_LIB : dll : LIB : main ; @@ -663,12 +663,11 @@ rule register-linker ( id composing ? : source-types + : target-types + : IMPORT $(__name__) : register-linker : : generators.register-linker ; -declare-type NT CYGWIN : RSP : rsp ; -if [ os.name ] in NT CYGWIN # must be conditional; we'll error on other OSes -{ - flags builtin.response-file FINDLIBS_ST ; - flags builtin.response-file FINDLIBS_SA ; - flags builtin.response-file LIBRARY_PATH ; - builtin.register-linker builtin.response-file : OBJ SEARCHED_LIB STATIC_LIB IMPORT_LIB : RSP ; -} + +declare-type : RSP : rsp ; +flags builtin.response-file FINDLIBS_ST ; +flags builtin.response-file FINDLIBS_SA ; +flags builtin.response-file LIBRARY_PATH ; +builtin.register-linker builtin.response-file : OBJ SEARCHED_LIB STATIC_LIB IMPORT_LIB : RSP ; +