diff --git a/gcc-tools.jam b/gcc-tools.jam
index 671ea7c7f..3d6bbef05 100644
--- a/gcc-tools.jam
+++ b/gcc-tools.jam
@@ -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) ;
diff --git a/v1/gcc-tools.jam b/v1/gcc-tools.jam
index 671ea7c7f..3d6bbef05 100644
--- a/v1/gcc-tools.jam
+++ b/v1/gcc-tools.jam
@@ -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) ;