From 8327757da1feebedda230bbf99a1e97e37526d43 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 5 Mar 2004 07:22:41 +0000 Subject: [PATCH] Fix compilation with CodeWarrior. Even though it compiles the bootstrap jam0 compiling the full version now causes a compiler crash. [SVN r22432] --- historic/jam/src/build.bat | 2 +- historic/jam/src/build.jam | 6 +++--- jam_src/build.bat | 2 +- jam_src/build.jam | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/historic/jam/src/build.bat b/historic/jam/src/build.bat index 92f461b9e..87e70e743 100644 --- a/historic/jam/src/build.bat +++ b/historic/jam/src/build.bat @@ -214,7 +214,7 @@ if "_%BOOST_JAM_TOOLSET%_" == "_metrowerks_" ( if "_%BOOST_JAM_TOOLSET%_" == "_metrowerks_" ( if not "_%BOOST_JAM_TOOLSET_ROOT%_" == "__" ( set PATH=%BOOST_JAM_TOOLSET_ROOT%Other Metrowerks Tools\Command Line Tools;%PATH%) - set BOOST_JAM_CC=mwcc -runtime staticsingle -DNT + set BOOST_JAM_CC=mwcc -runtime ss -cwd include -DNT -ladvapi32.lib set BOOST_JAM_OPT_JAM=-o bootstrap.%BOOST_JAM_TOOLSET%\jam0.exe set BOOST_JAM_OPT_MKJAMBASE=-o bootstrap.%BOOST_JAM_TOOLSET%\mkjambase0.exe set BOOST_JAM_OPT_YYACC=-o bootstrap.%BOOST_JAM_TOOLSET%\yyacc0.exe diff --git a/historic/jam/src/build.jam b/historic/jam/src/build.jam index 1ce863da0..3a8462e04 100644 --- a/historic/jam/src/build.jam +++ b/historic/jam/src/build.jam @@ -129,9 +129,9 @@ toolset kylix bc++ : -o : -D local mwcc = ; if $(NT) { mwcc = mwcc ; } else { mwcc = mwc$(OSPLAT:L) ; } mwcc ?= mwcc ; toolset metrowerks $(mwcc) : "-o " : -D - : -subsystem console -runtime staticsingle - [ opt --release : -opt full -inline auto -inline level=8 ] - [ opt --debug : -O0 -inline off ] ; + : -subsystem console -cwd include -ladvapi32.lib + [ opt --release : -runtime ss -opt full -inline auto -inline level=8 ] + [ opt --debug : -runtime ssd -O0 -inline off ] ; } ## MINGW GCC toolset mingw gcc : "-o " : -D diff --git a/jam_src/build.bat b/jam_src/build.bat index 92f461b9e..87e70e743 100644 --- a/jam_src/build.bat +++ b/jam_src/build.bat @@ -214,7 +214,7 @@ if "_%BOOST_JAM_TOOLSET%_" == "_metrowerks_" ( if "_%BOOST_JAM_TOOLSET%_" == "_metrowerks_" ( if not "_%BOOST_JAM_TOOLSET_ROOT%_" == "__" ( set PATH=%BOOST_JAM_TOOLSET_ROOT%Other Metrowerks Tools\Command Line Tools;%PATH%) - set BOOST_JAM_CC=mwcc -runtime staticsingle -DNT + set BOOST_JAM_CC=mwcc -runtime ss -cwd include -DNT -ladvapi32.lib set BOOST_JAM_OPT_JAM=-o bootstrap.%BOOST_JAM_TOOLSET%\jam0.exe set BOOST_JAM_OPT_MKJAMBASE=-o bootstrap.%BOOST_JAM_TOOLSET%\mkjambase0.exe set BOOST_JAM_OPT_YYACC=-o bootstrap.%BOOST_JAM_TOOLSET%\yyacc0.exe diff --git a/jam_src/build.jam b/jam_src/build.jam index 1ce863da0..3a8462e04 100644 --- a/jam_src/build.jam +++ b/jam_src/build.jam @@ -129,9 +129,9 @@ toolset kylix bc++ : -o : -D local mwcc = ; if $(NT) { mwcc = mwcc ; } else { mwcc = mwc$(OSPLAT:L) ; } mwcc ?= mwcc ; toolset metrowerks $(mwcc) : "-o " : -D - : -subsystem console -runtime staticsingle - [ opt --release : -opt full -inline auto -inline level=8 ] - [ opt --debug : -O0 -inline off ] ; + : -subsystem console -cwd include -ladvapi32.lib + [ opt --release : -runtime ss -opt full -inline auto -inline level=8 ] + [ opt --debug : -runtime ssd -O0 -inline off ] ; } ## MINGW GCC toolset mingw gcc : "-o " : -D