diff --git a/src/scripts/extensions/ibm.ps1 b/src/scripts/extensions/ibm.ps1 index e6aaec6a..cc9caa7f 100644 --- a/src/scripts/extensions/ibm.ps1 +++ b/src/scripts/extensions/ibm.ps1 @@ -21,8 +21,8 @@ Function Add-IbmCli() { Get-File -Url "https://public.dhe.ibm.com/ibmdl/export/pub/software/data/db2/drivers/odbc_cli/$archive" -OutFile $destination > $null 2>&1 Expand-Archive -Path $destination -DestinationPath $php_dir -Force > $null 2>&1 } + Add-Path "$cliPath\bin" $env:IBM_DB_HOME = $cliPath - $env:PATH = "$cliPath\bin;$env:PATH" $env:LD_LIBRARY_PATH = "$cliPath\bin;$cliPath\lib;$env:LD_LIBRARY_PATH" } diff --git a/src/scripts/extensions/ibm.sh b/src/scripts/extensions/ibm.sh index ac69322c..f4da91f4 100644 --- a/src/scripts/extensions/ibm.sh +++ b/src/scripts/extensions/ibm.sh @@ -59,7 +59,7 @@ add_cli_driver() { echo "$ibm_cli/lib" | sudo tee /etc/ld.so.conf.d/ibm_db2.conf >/dev/null sudo ldconfig else - libs="${brew_prefix:?}/lib" + libs="/usr/local/lib" sudo mkdir -p "$libs" sudo ln -sf "$ibm_cli"/lib/*.dylib "$libs" >/dev/null 2>&1 || true fi @@ -72,6 +72,7 @@ add_ibm_helper() { export IBM_DB_HOME="$ibm_cli" export LD_LIBRARY_PATH="$IBM_DB_HOME/lib:${LD_LIBRARY_PATH:-}" export DYLD_LIBRARY_PATH="$IBM_DB_HOME/lib:${DYLD_LIBRARY_PATH:-}" + export LDFLAGS="-Wl,-rpath,$IBM_DB_HOME/lib:$LDFLAGS" local configure_flag if [ "$ext" = 'ibm_db2' ]; then configure_flag="--with-IBM_DB2=$IBM_DB_HOME"