From b9687a467905aa3bda2023f369d2fe05a7670a47 Mon Sep 17 00:00:00 2001 From: Dave Abrahams Date: Sun, 14 Jul 2002 22:09:22 +0000 Subject: [PATCH] Fix up RUN_PATH for testing [SVN r14461] --- intel-win32-stlport-tools.jam | 6 +++++- v1/intel-win32-stlport-tools.jam | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/intel-win32-stlport-tools.jam b/intel-win32-stlport-tools.jam index 4b7259440..2d564e37a 100644 --- a/intel-win32-stlport-tools.jam +++ b/intel-win32-stlport-tools.jam @@ -18,11 +18,15 @@ # tests, and seems to be unneeded for the regression tests, but it # is a slight hack. local root = [ get-stlport-root ] ; - if ! $(root)/lib in $(gTOOLSET_LIB_PATH) + if ! [ MATCH $(root)[\\\\/]lib : $(gTOOLSET_LIB_PATH) ] { # Stick it at the front of the path because Windows only seems # to be willing to look so far, then quits! gTOOLSET_LIB_PATH = $(root)/lib $(gTOOLSET_LIB_PATH) ; } + if ! [ MATCH $(root)[\\\\/]lib : $(RUN_PATH) ] + { + RUN_PATH = $(root)/lib $(RUN_PATH) ; + } } \ No newline at end of file diff --git a/v1/intel-win32-stlport-tools.jam b/v1/intel-win32-stlport-tools.jam index 4b7259440..2d564e37a 100644 --- a/v1/intel-win32-stlport-tools.jam +++ b/v1/intel-win32-stlport-tools.jam @@ -18,11 +18,15 @@ # tests, and seems to be unneeded for the regression tests, but it # is a slight hack. local root = [ get-stlport-root ] ; - if ! $(root)/lib in $(gTOOLSET_LIB_PATH) + if ! [ MATCH $(root)[\\\\/]lib : $(gTOOLSET_LIB_PATH) ] { # Stick it at the front of the path because Windows only seems # to be willing to look so far, then quits! gTOOLSET_LIB_PATH = $(root)/lib $(gTOOLSET_LIB_PATH) ; } + if ! [ MATCH $(root)[\\\\/]lib : $(RUN_PATH) ] + { + RUN_PATH = $(root)/lib $(RUN_PATH) ; + } } \ No newline at end of file