boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-15 13:02:11 +00:00
Code Issues Projects Releases Wiki Activity

Rename link-runtime to runtime-link to stay compatible with V1.

Browse Source 
[SVN r29586]
This commit is contained in:
Vladimir Prus
2005-06-15 12:24:06 +00:00
parent 9bef15921f
commit 4d6bfe4eef
10 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
v2/test/gcc_runtime.py
View File

@@ -24,11 +24,11 @@ int main()
}
""")
t.run_build_system("link-runtime=static", status=1)
t.run_build_system("runtime-link=static", status=1)
t.fail_test(string.find(t.stdout(),
"on gcc, DLL can't be build with <link-runtime>static") == -1)
"on gcc, DLL can't be build with <runtime-link>static") == -1)
t.run_build_system("link=static link-runtime=static")
t.expect_addition("bin/$toolset/debug/link-runtime-static/link-static/hello.lib")
t.run_build_system("link=static runtime-link=static")
t.expect_addition("bin/$toolset/debug/link-static/runtime-link-static/hello.lib")
t.cleanup()

2
v2/test/searched_lib.py
View File

@@ -132,7 +132,7 @@ t.write("project-root.jam", "")
t.write("a.cpp", "")
t.write("Jamfile", """
project a : requirements <link-runtime>static ;
project a : requirements <runtime-link>static ;
static-lib a : a.cpp l ;
lib l : : <name>l_f ;

2
v2/tools/borland.jam
View File

@@ -75,7 +75,7 @@ flags borland OPTIONS <user-interface>console : -tWC ;
# -tWR sets -tW as well, so we turn it off here and then turn it
# on again later if we need it:
flags borland OPTIONS <link-runtime>shared : -tWR -tWC ;
flags borland OPTIONS <runtime-link>shared : -tWR -tWC ;
flags borland OPTIONS <user-interface>gui : -tW ;
flags borland OPTIONS <main-target-type>LIB/<link>shared : -tWD ;

2
v2/tools/builtin.jam
View File

@@ -33,7 +33,7 @@ feature toolset : : implicit propagated symmetric ;
feature stdlib : native : propagated composite ;
feature link : shared static : propagated ;
feature link-runtime : shared static : propagated ;
feature runtime-link : shared static : propagated ;
feature runtime-debugging : on off : propagated ;

14
v2/tools/gcc.jam
View File

@@ -154,18 +154,18 @@ actions compile.c
}
# The class which check that we don't try to use
# the <link-runtime>static property while creating or using shared library,
# the <runtime-link>static property while creating or using shared library,
# since it's not supported by gcc/libc.
class gcc-linking-generator : unix-linking-generator
{
rule generated-targets ( sources + : property-set : project name ? )
{
if <link-runtime>static in [ $(property-set).raw ]
if <runtime-link>static in [ $(property-set).raw ]
{
local m ;
if [ id ] = "gcc.link.dll"
{
m = "on gcc, DLL can't be build with <link-runtime>static" ;
m = "on gcc, DLL can't be build with <runtime-link>static" ;
}
if ! $(m) {
for local s in $(sources)
@@ -173,14 +173,14 @@ class gcc-linking-generator : unix-linking-generator
local type = [ $(s).type ] ;
if $(type) && [ type.is-derived $(type) SHARED_LIB ]
{
m = "on gcc, using DLLS together with the <link-runtime>static options is not possible " ;
m = "on gcc, using DLLS together with the <runtime-link>static options is not possible " ;
}
}
}
if $(m)
{
errors.user-error $(m) :
"it's suggested to use <link-runtime>static together with the <link>static" ;
"it's suggested to use <runtime-link>static together with the <link>static" ;
}
}
@@ -211,9 +211,9 @@ flags gcc.link FINDLIBS-ST <find-static-library> ;
flags gcc.link FINDLIBS-SA <find-shared-library> ;
flags gcc.link LIBRARIES <library-file> ;
# For <link-runtime>static we made sure there are no dynamic libraries
# For <runtime-link>static we made sure there are no dynamic libraries
# in the link
flags gcc.link OPTIONS <link-runtime>static : -static ;
flags gcc.link OPTIONS <runtime-link>static : -static ;
# Now, the vendor specific flags
# The parameter linker can be either gnu or sun

12
v2/tools/ifort.jam
View File

@@ -22,12 +22,12 @@ flags ifort OPTIONS <optimization>space : /O1 ;
flags ifort OPTIONS <debug-symbols>on : /debug:full ;
flags ifort OPTIONS <profiling>on : /Qprof_gen ;
flags ifort.compile FFLAGS <runtime-debugging>off/<link-runtime>shared : /MD ;
flags ifort.compile FFLAGS <runtime-debugging>on/<link-runtime>shared : /MDd ;
flags ifort.compile FFLAGS <runtime-debugging>off/<link-runtime>static/<threading>single : /ML ;
flags ifort.compile FFLAGS <runtime-debugging>on/<link-runtime>static/<threading>single : /MLd ;
flags ifort.compile FFLAGS <runtime-debugging>off/<link-runtime>static/<threading>multi : /MT ;
flags ifort.compile FFLAGS <runtime-debugging>on/<link-runtime>static/<threading>multi : /MTd ;
flags ifort.compile FFLAGS <runtime-debugging>off/<runtime-link>shared : /MD ;
flags ifort.compile FFLAGS <runtime-debugging>on/<runtime-link>shared : /MDd ;
flags ifort.compile FFLAGS <runtime-debugging>off/<runtime-link>static/<threading>single : /ML ;
flags ifort.compile FFLAGS <runtime-debugging>on/<runtime-link>static/<threading>single : /MLd ;
flags ifort.compile FFLAGS <runtime-debugging>off/<runtime-link>static/<threading>multi : /MT ;
flags ifort.compile FFLAGS <runtime-debugging>on/<runtime-link>static/<threading>multi : /MTd ;
flags ifort DEFINES <define> ;
flags ifort INCLUDES <include> ;

12
v2/tools/msvc.jam
View File

@@ -253,13 +253,13 @@ flags msvc.compile C++FLAGS <exception-handling>on/<asynch-exceptions>on/<exter
flags msvc.compile C++FLAGS <exception-handling>on/<asynch-exceptions>on/<extern-c-nothrow>on : /EHac ;
flags msvc.compile CFLAGS <rtti>on : /GR ;
flags msvc.compile CFLAGS <runtime-debugging>off/<link-runtime>shared : /MD ;
flags msvc.compile CFLAGS <runtime-debugging>on/<link-runtime>shared : /MDd ;
flags msvc.compile CFLAGS <runtime-debugging>off/<runtime-link>shared : /MD ;
flags msvc.compile CFLAGS <runtime-debugging>on/<runtime-link>shared : /MDd ;
flags msvc.compile CFLAGS <runtime-debugging>off/<link-runtime>static/<threading>single : /ML ;
flags msvc.compile CFLAGS <runtime-debugging>on/<link-runtime>static/<threading>single : /MLd ;
flags msvc.compile CFLAGS <runtime-debugging>off/<link-runtime>static/<threading>multi : /MT ;
flags msvc.compile CFLAGS <runtime-debugging>on/<link-runtime>static/<threading>multi : /MTd ;
flags msvc.compile CFLAGS <runtime-debugging>off/<runtime-link>static/<threading>single : /ML ;
flags msvc.compile CFLAGS <runtime-debugging>on/<runtime-link>static/<threading>single : /MLd ;
flags msvc.compile CFLAGS <runtime-debugging>off/<runtime-link>static/<threading>multi : /MT ;
flags msvc.compile CFLAGS <runtime-debugging>on/<runtime-link>static/<threading>multi : /MTd ;
flags msvc.compile USER_CFLAGS <cflags> : ;
flags msvc.compile.c++ USER_CFLAGS <cxxflags> : ;

2
v2/tools/stage.jam
View File

@@ -429,7 +429,7 @@ rule rename ( name : type ? : property-set : unversioned ? )
if <threading>multi in $(properties) { thread-tag = mt ; }
local runtime-tag = ;
if <link-runtime>static in $(properties) { runtime-tag += s ; }
if <runtime-link>static in $(properties) { runtime-tag += s ; }
if <runtime-build>debug in $(properties) { runtime-tag += g ; }
if <variant>debug-python in $(properties) { runtime-tag += y ; }

4
v2/tools/sun.jam
View File

@@ -76,8 +76,8 @@ flags sun.link LINKPATH <library-path> ;
flags sun.link FINDLIBS-ST <find-static-library> ;
flags sun.link FINDLIBS-SA <find-shared-library> ;
flags sun.link LIBRARIES <library-file> ;
flags sun.link LINK-RUNTIME <link-runtime>static : static ;
flags sun.link LINK-RUNTIME <link-runtime>shared : dynamic ;
flags sun.link LINK-RUNTIME <runtime-link>static : static ;
flags sun.link LINK-RUNTIME <runtime-link>shared : dynamic ;
flags sun.link RPATH <dll-path> ;
# On gcc, there are separate options for dll path at runtime and
# link time. On Solaris, there's only one: -R, so we have to use

4
v2/tools/vacpp.jam
View File

@@ -43,8 +43,8 @@ flags vacpp C++FLAGS <exception-handling>on : -qeh ;
flags vacpp C++FLAGS <rtti>off : -qnortti ;
flags vacpp C++FLAGS <rtti>on : -qrtti ;
# flags vacpp LINKFLAGS <link-runtime>static : -llibstd_v2.a ;
# flags vacpp LINKFLAGS <link-runtime>shared : -llibstd_v2.sl ;
# flags vacpp LINKFLAGS <runtime-link>static : -llibstd_v2.a ;
# flags vacpp LINKFLAGS <runtime-link>shared : -llibstd_v2.sl ;
# We want the full path to the sources in the debug symbols because otherwise
# the debugger won't find the sources when we use boost.build.