From cfa7877afe3bd77c9f77bff1edad4ae24e983bf9 Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Thu, 10 Jan 2019 09:01:15 +0200 Subject: [PATCH] Fix provisioning ODBC environmetal variables had : at end CPLUS_INCLUDE_PATH and LIBRARY_PATH environmental variables had --> : <-- at end of variable. As this adds current dir to search path this is undesirable and causes bugs. Change-Id: Ia36c3f3f791f5d506eea15aba6be6d665049a922 Reviewed-by: Juha Karjalainen Reviewed-by: Michal Klocek --- coin/provisioning/common/macos/libiodbc.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/macos/libiodbc.sh b/coin/provisioning/common/macos/libiodbc.sh index 6c10ccbf..79fa86c2 100755 --- a/coin/provisioning/common/macos/libiodbc.sh +++ b/coin/provisioning/common/macos/libiodbc.sh @@ -48,7 +48,7 @@ brew install libiodbc read -r -a arr <<< $(brew list --versions libiodbc) version=${arr[1]} -SetEnvVar "CPLUS_INCLUDE_PATH" "/usr/local/Cellar/libiodbc/$version/include:$CPLUS_INCLUDE_PATH" -SetEnvVar "LIBRARY_PATH" "/usr/local/Cellar/libiodbc/$version/lib:$LIBRARY_PATH" +SetEnvVar "CPLUS_INCLUDE_PATH" "/usr/local/Cellar/libiodbc/$version/include${CPLUS_INCLUDE_PATH:+:}${CPLUS_INCLUDE_PATH}" +SetEnvVar "LIBRARY_PATH" "/usr/local/Cellar/libiodbc/$version/lib${LIBRARY_PATH:+:}${LIBRARY_PATH}" echo "libiodbc = $version" >> ~/versions.txt