mirror of
https://github.com/boostorg/build.git
synced 2026-02-16 01:12:13 +00:00
Patch to work around env avariable splits on spaces
[SVN r13780]
This commit is contained in:
@@ -7,6 +7,9 @@
|
||||
# this is simply an extension to the gcc toolset.
|
||||
extends-toolset gcc ;
|
||||
|
||||
# singleton variables...
|
||||
set-as-singleton STLPORT_INCLUDE_DIRECTORY STLPORT_LIB_DIRECTORY STLPORT_ROOT ;
|
||||
|
||||
if $(NT)
|
||||
{
|
||||
GCC_STLPORT_LIB_ID = cygwin ;
|
||||
|
||||
@@ -43,6 +43,9 @@
|
||||
# Similar to GXX, the name by which gcc is invoked for "C"
|
||||
# language targets.
|
||||
|
||||
# singleton variables...
|
||||
set-as-singleton GCC_ROOT_DIRECTORY GCC_BIN_DIRECTORY GCC_INCLUDE_DIRECTORY GCC_STDLIB_DIRECTORY ;
|
||||
|
||||
GCC_BIN_DIRECTORY ?= $(GCC_ROOT_DIRECTORY)/bin/ ;
|
||||
GCC_BIN_DIRECTORY ?= "" ; # Don't clobber tool names if GCC_ROOT_DIRECTORY not set
|
||||
GCC_INCLUDE_DIRECTORY ?= $(GCC_ROOT_DIRECTORY)/include ;
|
||||
|
||||
@@ -10,6 +10,9 @@
|
||||
# program as the column heading for HTML tables. Must not include version number.
|
||||
#//<a href="http://developer.intel.com/software/products/compilers/">Intel<br>C++</a>
|
||||
|
||||
# singleton variables...
|
||||
set-as-singleton INTELC ;
|
||||
|
||||
# compute INTEL tool path. You can either use the environment variable
|
||||
# setup that comes with the Intel compiler, or you can set the
|
||||
# INTEL_PATH or INTELC (in order to respect FTJam setup) environment
|
||||
|
||||
@@ -19,6 +19,9 @@
|
||||
# program as the column heading for HTML tables. Must not include version number.
|
||||
#//<a href="http://www.metrowerks.com/products/windows/">Metro-<br>werks<br>Code-<br>Warrior</a>
|
||||
|
||||
# singleton variables...
|
||||
set-as-singleton METROWERKS_ROOT METROWERKS_INCLUDE_ROOT CWFOLDER ;
|
||||
|
||||
# Get these variable set on the targets so that we can re-use the
|
||||
# build actions for other toolsets using this one as a base.
|
||||
flags metrowerks METROWERKS_SETUP ;
|
||||
@@ -67,8 +70,7 @@ flags metrowerks NEEDLIBS <library-file> ;
|
||||
flags metrowerks FINDLIBS <find-library> ;
|
||||
|
||||
# How will we find metrowerks standard headers?
|
||||
# If the user specified METROWERKS_INCLUDE_ROOT, use that
|
||||
# Otherwise, if he specified METROWERKS_ROOT, use that
|
||||
# If the user specified METROWERKS_ROOT, use that
|
||||
# Otherwise, look at the "standard" environment variable CWFOLDER
|
||||
METROWERKS_INCLUDE_ROOT = $(METROWERKS_ROOT) ;
|
||||
METROWERKS_INCLUDE_ROOT ?= $(CWFOLDER) ;
|
||||
|
||||
@@ -4,6 +4,9 @@
|
||||
# "as is" without express or implied warranty, and with no claim as
|
||||
# to its suitability for any purpose.
|
||||
|
||||
# singleton variables...
|
||||
set-as-singleton MINGW_ROOT_DIRECTORY MINGW_BIN_DIRECTORY MINGW_INCLUDE_DIRECTORY MINGW_STDLIB_DIRECTORY ;
|
||||
|
||||
# compute directories for invoking MINGW
|
||||
MINGW_BIN_DIRECTORY ?= $(MINGW_ROOT_DIRECTORY)$(SLASH)bin$(SLASH) ;
|
||||
MINGW_BIN_DIRECTORY ?= "" ; # Don't clobber tool names if MINGW_ROOT_DIRECTORY not set
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
# This file was originally based on gcc-tools.jam by David Abrahams.
|
||||
|
||||
# singleton variables...
|
||||
set-as-singleton MIPSPRO_ROOT_DIRECTORY MIPSPRO_BIN_DIRECTORY MIPSPRO_INCLUDE_DIRECTORY MIPSPRO_C++INCLUDE_DIRECTORY MIPSPRO_STDLIB_DIRECTORY ;
|
||||
|
||||
# compute directories for invoking MIPSPRO
|
||||
MIPSPRO_ROOT_DIRECTORY ?= "/usr" ;
|
||||
MIPSPRO_BIN_DIRECTORY ?= "$(MIPSPRO_ROOT_DIRECTORY)/bin" ;
|
||||
|
||||
@@ -10,6 +10,9 @@
|
||||
# program as the column heading for HTML tables. Must not include version number.
|
||||
#//<a href="http://msdn.microsoft.com/vstudio/default.asp">Micro-<br>soft<br>VC++</a>
|
||||
|
||||
# singleton variables...
|
||||
set-as-singleton MSVCDir VISUALC MSVC_ROOT VC_TOOL_PATH VC_SETUP ;
|
||||
|
||||
# Get these variable set on the targets so that we can re-use the
|
||||
# build actions for other toolsets using this one as a base.
|
||||
flags msvc VC_TOOL_PATH ;
|
||||
|
||||
@@ -7,6 +7,9 @@
|
||||
# this is simply an extension to the gcc toolset.
|
||||
extends-toolset gcc ;
|
||||
|
||||
# singleton variables...
|
||||
set-as-singleton STLPORT_INCLUDE_DIRECTORY STLPORT_LIB_DIRECTORY STLPORT_ROOT ;
|
||||
|
||||
if $(NT)
|
||||
{
|
||||
GCC_STLPORT_LIB_ID = cygwin ;
|
||||
|
||||
@@ -43,6 +43,9 @@
|
||||
# Similar to GXX, the name by which gcc is invoked for "C"
|
||||
# language targets.
|
||||
|
||||
# singleton variables...
|
||||
set-as-singleton GCC_ROOT_DIRECTORY GCC_BIN_DIRECTORY GCC_INCLUDE_DIRECTORY GCC_STDLIB_DIRECTORY ;
|
||||
|
||||
GCC_BIN_DIRECTORY ?= $(GCC_ROOT_DIRECTORY)/bin/ ;
|
||||
GCC_BIN_DIRECTORY ?= "" ; # Don't clobber tool names if GCC_ROOT_DIRECTORY not set
|
||||
GCC_INCLUDE_DIRECTORY ?= $(GCC_ROOT_DIRECTORY)/include ;
|
||||
|
||||
@@ -10,6 +10,9 @@
|
||||
# program as the column heading for HTML tables. Must not include version number.
|
||||
#//<a href="http://developer.intel.com/software/products/compilers/">Intel<br>C++</a>
|
||||
|
||||
# singleton variables...
|
||||
set-as-singleton INTELC ;
|
||||
|
||||
# compute INTEL tool path. You can either use the environment variable
|
||||
# setup that comes with the Intel compiler, or you can set the
|
||||
# INTEL_PATH or INTELC (in order to respect FTJam setup) environment
|
||||
|
||||
@@ -19,6 +19,9 @@
|
||||
# program as the column heading for HTML tables. Must not include version number.
|
||||
#//<a href="http://www.metrowerks.com/products/windows/">Metro-<br>werks<br>Code-<br>Warrior</a>
|
||||
|
||||
# singleton variables...
|
||||
set-as-singleton METROWERKS_ROOT METROWERKS_INCLUDE_ROOT CWFOLDER ;
|
||||
|
||||
# Get these variable set on the targets so that we can re-use the
|
||||
# build actions for other toolsets using this one as a base.
|
||||
flags metrowerks METROWERKS_SETUP ;
|
||||
@@ -67,8 +70,7 @@ flags metrowerks NEEDLIBS <library-file> ;
|
||||
flags metrowerks FINDLIBS <find-library> ;
|
||||
|
||||
# How will we find metrowerks standard headers?
|
||||
# If the user specified METROWERKS_INCLUDE_ROOT, use that
|
||||
# Otherwise, if he specified METROWERKS_ROOT, use that
|
||||
# If the user specified METROWERKS_ROOT, use that
|
||||
# Otherwise, look at the "standard" environment variable CWFOLDER
|
||||
METROWERKS_INCLUDE_ROOT = $(METROWERKS_ROOT) ;
|
||||
METROWERKS_INCLUDE_ROOT ?= $(CWFOLDER) ;
|
||||
|
||||
@@ -4,6 +4,9 @@
|
||||
# "as is" without express or implied warranty, and with no claim as
|
||||
# to its suitability for any purpose.
|
||||
|
||||
# singleton variables...
|
||||
set-as-singleton MINGW_ROOT_DIRECTORY MINGW_BIN_DIRECTORY MINGW_INCLUDE_DIRECTORY MINGW_STDLIB_DIRECTORY ;
|
||||
|
||||
# compute directories for invoking MINGW
|
||||
MINGW_BIN_DIRECTORY ?= $(MINGW_ROOT_DIRECTORY)$(SLASH)bin$(SLASH) ;
|
||||
MINGW_BIN_DIRECTORY ?= "" ; # Don't clobber tool names if MINGW_ROOT_DIRECTORY not set
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
# This file was originally based on gcc-tools.jam by David Abrahams.
|
||||
|
||||
# singleton variables...
|
||||
set-as-singleton MIPSPRO_ROOT_DIRECTORY MIPSPRO_BIN_DIRECTORY MIPSPRO_INCLUDE_DIRECTORY MIPSPRO_C++INCLUDE_DIRECTORY MIPSPRO_STDLIB_DIRECTORY ;
|
||||
|
||||
# compute directories for invoking MIPSPRO
|
||||
MIPSPRO_ROOT_DIRECTORY ?= "/usr" ;
|
||||
MIPSPRO_BIN_DIRECTORY ?= "$(MIPSPRO_ROOT_DIRECTORY)/bin" ;
|
||||
|
||||
@@ -10,6 +10,9 @@
|
||||
# program as the column heading for HTML tables. Must not include version number.
|
||||
#//<a href="http://msdn.microsoft.com/vstudio/default.asp">Micro-<br>soft<br>VC++</a>
|
||||
|
||||
# singleton variables...
|
||||
set-as-singleton MSVCDir VISUALC MSVC_ROOT VC_TOOL_PATH VC_SETUP ;
|
||||
|
||||
# Get these variable set on the targets so that we can re-use the
|
||||
# build actions for other toolsets using this one as a base.
|
||||
flags msvc VC_TOOL_PATH ;
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
extends-toolset msvc ;
|
||||
|
||||
# singleton variables...
|
||||
set-as-singleton VC7_ROOT ;
|
||||
|
||||
if ! $(MSVCDir)
|
||||
{
|
||||
VC7_ROOT ?= "C:\\Program Files\\Microsoft Visual Studio .NET\\VC7" ;
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
extends-toolset msvc ;
|
||||
|
||||
# singleton variables...
|
||||
set-as-singleton VC7_ROOT ;
|
||||
|
||||
if ! $(MSVCDir)
|
||||
{
|
||||
VC7_ROOT ?= "C:\\Program Files\\Microsoft Visual Studio .NET\\VC7" ;
|
||||
|
||||
Reference in New Issue
Block a user