diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-03-20 01:23:16 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-03-20 01:23:16 +0200 |
| commit | dca3c83cd9f8d1ac8165707b080a420bf9a9a132 (patch) | |
| tree | c73c0e7e4146c5191a9caf0b54ceb2b566fd5eb6 /indra/cmake/run_build_test.py | |
| parent | ffa8d83eaf11b11a091743c6d666cc6c74553671 (diff) | |
| parent | f7838ca17c7e4a5a595f5cb898c70a18be4c9cd9 (diff) | |
Merge branch 'DRTVWR-568' into DRTVWR-573-maint-R
# Conflicts:
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/OpenJPEG.cmake
# indra/integration_tests/llui_libtest/CMakeLists.txt
# indra/newview/CMakeLists.txt
Diffstat (limited to 'indra/cmake/run_build_test.py')
| -rwxr-xr-x | indra/cmake/run_build_test.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/cmake/run_build_test.py b/indra/cmake/run_build_test.py index 1e92868ae7..1f040bded5 100755 --- a/indra/cmake/run_build_test.py +++ b/indra/cmake/run_build_test.py @@ -73,7 +73,7 @@ def main(command, arguments=[], libpath=[], vars={}): if sys.platform == "win32": lpvars = ["PATH"] elif sys.platform == "darwin": - lpvars = ["LD_LIBRARY_PATH", "DYLD_LIBRARY_PATH"] + lpvars = ["LD_LIBRARY_PATH"] # , "DYLD_LIBRARY_PATH"] elif sys.platform.startswith("linux"): lpvars = ["LD_LIBRARY_PATH"] else: |