diff options
| author | Arne Juul <arnej@yahooinc.com> | 2023-01-11 14:26:02 +0000 |
|---|---|---|
| committer | Arne Juul <arnej@yahooinc.com> | 2023-01-11 14:26:40 +0000 |
| commit | ef5413f6b211856c9f5701d56b60d6bc1fabe6b0 (patch) | |
| tree | 24759732ab84357cbd256d8a174690afa30828ff /client | |
| parent | 8cf9722ec8268753dfea424de540fd7133d5de83 (diff) | |
add /opt/vespa-deps/lib64 to LD_LIBRARY_PATH
Diffstat (limited to 'client')
| -rw-r--r-- | client/go/jvm/env.go | 2 | ||||
| -rw-r--r-- | client/go/prog/common_env.go | 2 | ||||
| -rw-r--r-- | client/go/script-utils/startcbinary/common_env.go | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/client/go/jvm/env.go b/client/go/jvm/env.go index dbc957e3ccb..d2f0b2e6616 100644 --- a/client/go/jvm/env.go +++ b/client/go/jvm/env.go @@ -19,7 +19,7 @@ func (opts *Options) exportEnvSettings(ps *prog.Spec) { vlt := fmt.Sprintf("file:%s/vespa.log", lvd) lcd := fmt.Sprintf("%s/var/db/vespa/logcontrol", vespaHome) lcf := fmt.Sprintf("%s/%s.logcontrol", lcd, c.ServiceName()) - dlp := fmt.Sprintf("%s/lib64", vespaHome) + dlp := fmt.Sprintf("%s/lib64:/opt/vespa-deps/lib64", vespaHome) opts.fixSpec.FixDir(lvd) opts.fixSpec.FixDir(lcd) ps.Setenv(envvars.VESPA_LOG_TARGET, vlt) diff --git a/client/go/prog/common_env.go b/client/go/prog/common_env.go index a970895bf84..150a4aaa38f 100644 --- a/client/go/prog/common_env.go +++ b/client/go/prog/common_env.go @@ -15,7 +15,7 @@ func (spec *Spec) configureCommonEnv() { os.Unsetenv(envvars.LD_PRELOAD) spec.Setenv(envvars.STD_THREAD_PREVENT_TRY_CATCH, "true") spec.Setenv(envvars.GLIBCXX_FORCE_NEW, "1") - spec.Setenv(envvars.LD_LIBRARY_PATH, vespa.FindHome()+"/lib64") + spec.Setenv(envvars.LD_LIBRARY_PATH, vespa.FindHome()+"/lib64:/opt/vespa-deps/lib64") spec.Setenv(envvars.MALLOC_ARENA_MAX, "1") // fallback from old env.vars: diff --git a/client/go/script-utils/startcbinary/common_env.go b/client/go/script-utils/startcbinary/common_env.go index 812f182a757..eadb0aafb1b 100644 --- a/client/go/script-utils/startcbinary/common_env.go +++ b/client/go/script-utils/startcbinary/common_env.go @@ -26,7 +26,7 @@ func (spec *ProgSpec) configureCommonEnv() { os.Unsetenv(envvars.LD_PRELOAD) spec.setenv(envvars.STD_THREAD_PREVENT_TRY_CATCH, "true") spec.setenv(envvars.GLIBCXX_FORCE_NEW, "1") - spec.setenv(envvars.LD_LIBRARY_PATH, vespa.FindHome()+"/lib64") + spec.setenv(envvars.LD_LIBRARY_PATH, vespa.FindHome()+"/lib64:/opt/vespa-deps/lib64") spec.setenv(envvars.MALLOC_ARENA_MAX, "1") // fallback from old env.vars: |