mirror of
https://github.com/boostorg/build.git
synced 2026-02-17 01:32:12 +00:00
More fragile tweaks for running under Cygwin
[SVN r17699]
This commit is contained in:
@@ -46,14 +46,13 @@
|
||||
# singleton variables...
|
||||
set-as-singleton GCC_ROOT_DIRECTORY GCC_BIN_DIRECTORY GCC_INCLUDE_DIRECTORY GCC_STDLIB_DIRECTORY ;
|
||||
|
||||
flags gcc GCC_ROOT_DIRECTORY : $(GCC_ROOT_DIRECTORY) ;
|
||||
flags gcc GCC_BIN_DIRECTORY : $(GCC_BIN_DIRECTORY) ;
|
||||
flags gcc GCC_INCLUDE_DIRECTORY : $(GCC_INCLUDE_DIRECTORY) ;
|
||||
flags gcc GCC_STDLIB_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_STDLIB_DIRECTORY ?= $(GCC_ROOT_DIRECTORY)/lib ;
|
||||
GCC_STDLIB_DIRECTORY ?= $(GCC_ROOT_DIRECTORY:E="")/lib ;
|
||||
|
||||
# Make sure this gets set "on" the target
|
||||
flags gcc GCC_BIN_DIR : $(GCC_BIN_DIRECTORY) ;
|
||||
|
||||
@@ -46,14 +46,13 @@
|
||||
# singleton variables...
|
||||
set-as-singleton GCC_ROOT_DIRECTORY GCC_BIN_DIRECTORY GCC_INCLUDE_DIRECTORY GCC_STDLIB_DIRECTORY ;
|
||||
|
||||
flags gcc GCC_ROOT_DIRECTORY : $(GCC_ROOT_DIRECTORY) ;
|
||||
flags gcc GCC_BIN_DIRECTORY : $(GCC_BIN_DIRECTORY) ;
|
||||
flags gcc GCC_INCLUDE_DIRECTORY : $(GCC_INCLUDE_DIRECTORY) ;
|
||||
flags gcc GCC_STDLIB_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_STDLIB_DIRECTORY ?= $(GCC_ROOT_DIRECTORY)/lib ;
|
||||
GCC_STDLIB_DIRECTORY ?= $(GCC_ROOT_DIRECTORY:E="")/lib ;
|
||||
|
||||
# Make sure this gets set "on" the target
|
||||
flags gcc GCC_BIN_DIR : $(GCC_BIN_DIRECTORY) ;
|
||||
|
||||
Reference in New Issue
Block a user