From 2e6de79f00fad4df6ef21fc5ced3f999662e2f89 Mon Sep 17 00:00:00 2001 From: Hartmut Kaiser Date: Tue, 2 May 2006 15:19:49 +0000 Subject: [PATCH] Fixed Wave Jamfile.v2 to correctly disable RTTI for VC7.1 [SVN r33909] --- ChangeLog | 1 + build/Jamfile.v2 | 2 +- samples/advanced_hooks/build/Jamfile.v2 | 2 +- samples/cpp_tokens/build/Jamfile.v2 | 2 +- samples/lexed_tokens/build/Jamfile.v2 | 2 +- samples/list_includes/build/Jamfile.v2 | 2 +- samples/quick_start/build/Jamfile.v2 | 2 +- samples/waveidl/build/Jamfile.v2 | 2 +- test/build/Jamfile.v2 | 5 +---- tool/build/Jamfile.v2 | 2 +- 10 files changed, 10 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1c211ee..92c4883 100644 --- a/ChangeLog +++ b/ChangeLog @@ -114,6 +114,7 @@ Boost V1.34.0 - Fixed Wave tools startup crash when compiled with VC8. - Added the name of the generating compiler (BOOST_COMPILER) to the full Wave version info. +- Fixed all Jamfile.v2 to correctly disable RTTI for VC7.1. Sat Feb 18 2005 - Version 1.2.3 diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 index 4dd55ce..5338f07 100644 --- a/build/Jamfile.v2 +++ b/build/Jamfile.v2 @@ -33,7 +33,7 @@ lib boost_wave $(SOURCES).cpp /boost/filesystem//boost_filesystem : - msvc-7.1:off # workaround for compiler bug + 7.1:off # workaround for compiler bug # Not supported by V2 # cpp_re.cpp ; diff --git a/samples/advanced_hooks/build/Jamfile.v2 b/samples/advanced_hooks/build/Jamfile.v2 index fa0b0a5..7e99934 100644 --- a/samples/advanced_hooks/build/Jamfile.v2 +++ b/samples/advanced_hooks/build/Jamfile.v2 @@ -12,6 +12,6 @@ exe advanced_hooks : ../advanced_hooks.cpp ../../../build//boost_wave : - msvc-7.1:off # workaround for compiler bug + 7.1:off # workaround for compiler bug ; diff --git a/samples/cpp_tokens/build/Jamfile.v2 b/samples/cpp_tokens/build/Jamfile.v2 index f481434..126b5af 100644 --- a/samples/cpp_tokens/build/Jamfile.v2 +++ b/samples/cpp_tokens/build/Jamfile.v2 @@ -18,6 +18,6 @@ exe cpp_tokens ../../../build//boost_wave $(BOOST_ROOT)/boost/program_options//boost_program_options : - msvc-7.1:off # workaround for compiler bug + 7.1:off # workaround for compiler bug ; diff --git a/samples/lexed_tokens/build/Jamfile.v2 b/samples/lexed_tokens/build/Jamfile.v2 index bf4d2e2..e9fbfc7 100644 --- a/samples/lexed_tokens/build/Jamfile.v2 +++ b/samples/lexed_tokens/build/Jamfile.v2 @@ -12,6 +12,6 @@ exe lexed_tokens : ../lexed_tokens.cpp ../../../build//boost_wave : - msvc-7.1:off # workaround for compiler bug + 7.1:off # workaround for compiler bug ; diff --git a/samples/list_includes/build/Jamfile.v2 b/samples/list_includes/build/Jamfile.v2 index 9dc16ef..f7b49c3 100644 --- a/samples/list_includes/build/Jamfile.v2 +++ b/samples/list_includes/build/Jamfile.v2 @@ -14,6 +14,6 @@ exe list_includes $(BOOST_ROOT)/boost/program_options//boost_program_options $(BOOST_ROOT)/boost/filesystem//boost_filesystem : - msvc-7.1:off # workaround for compiler bug + 7.1:off # workaround for compiler bug ; diff --git a/samples/quick_start/build/Jamfile.v2 b/samples/quick_start/build/Jamfile.v2 index 47aaa5d..670ca13 100644 --- a/samples/quick_start/build/Jamfile.v2 +++ b/samples/quick_start/build/Jamfile.v2 @@ -12,6 +12,6 @@ exe quick_start : ../quick_start.cpp ../../../build//boost_wave : - msvc-7.1:off # workaround for compiler bug + 7.1:off # workaround for compiler bug ; diff --git a/samples/waveidl/build/Jamfile.v2 b/samples/waveidl/build/Jamfile.v2 index 6882556..a2edfed 100644 --- a/samples/waveidl/build/Jamfile.v2 +++ b/samples/waveidl/build/Jamfile.v2 @@ -19,6 +19,6 @@ exe waveidl ../../../build//boost_wave $(BOOST_ROOT)/boost/program_options//boost_program_options : - msvc-7.1:off # workaround for compiler bug + 7.1:off # workaround for compiler bug ; diff --git a/test/build/Jamfile.v2 b/test/build/Jamfile.v2 index 8ad642d..e69a87a 100644 --- a/test/build/Jamfile.v2 +++ b/test/build/Jamfile.v2 @@ -35,14 +35,13 @@ TESTWAVE_FILES = test.cfg project wave/test : requirements - msvc:off + 7.1:off # workaround for compiler bug # NT:static single debug BOOST_LIB_DIAGNOSTIC=1 BOOST_ALL_NO_LIB=1 shared:BOOST_ALL_DYN_LINK=1 - ; # @@ -57,7 +56,6 @@ test-suite wave /boost/wave//boost_wave /boost/program_options//boost_program_options /boost/filesystem//boost_filesystem - : # arguments $(TESTWAVE_ARGUMENTS) @@ -78,7 +76,6 @@ test-suite wave /boost/wave//boost_wave/static /boost/program_options//boost_program_options/static /boost/filesystem//boost_filesystem/static - : # arguments $(TESTWAVE_ARGUMENTS) diff --git a/tool/build/Jamfile.v2 b/tool/build/Jamfile.v2 index f3f0b92..37f280f 100644 --- a/tool/build/Jamfile.v2 +++ b/tool/build/Jamfile.v2 @@ -24,7 +24,7 @@ exe wave /boost/filesystem//boost_filesystem /boost/serialization//boost_serialization : - msvc-7.1:off # workaround for compiler bug + 7.1:off # workaround for compiler bug # on : release