diff options
| author | Jeroen van Rijn <Kelimion@users.noreply.github.com> | 2024-04-20 12:08:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-20 12:08:12 +0200 |
| commit | caa8863c972a82c3d43fda9d56f3b41f90b2fe54 (patch) | |
| tree | 94825a7ddf1fae140f6488a74660c4aef952142a /src/build_settings.cpp | |
| parent | 3620e62ff76f39100c0c6ba8032d0e3deb74225f (diff) | |
| parent | ebb1a07dd081bb9210e093ebac89f692cb8200d6 (diff) | |
Merge pull request #3455 from Hyrtwol/normalize-path
Normalize ODIN_ROOT path
Diffstat (limited to 'src/build_settings.cpp')
| -rw-r--r-- | src/build_settings.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/build_settings.cpp b/src/build_settings.cpp index b806adcd6..03a95a19b 100644 --- a/src/build_settings.cpp +++ b/src/build_settings.cpp @@ -840,13 +840,11 @@ gb_internal String odin_root_dir(void) { char const *found = gb_get_env("ODIN_ROOT", a); if (found) { String path = path_to_full_path(a, make_string_c(found)); - if (path[path.len-1] != '/' && path[path.len-1] != '\\') { #if defined(GB_SYSTEM_WINDOWS) - path = concatenate_strings(a, path, WIN32_SEPARATOR_STRING); + path = normalize_path(a, path, WIN32_SEPARATOR_STRING); #else - path = concatenate_strings(a, path, NIX_SEPARATOR_STRING); + path = normalize_path(a, path, NIX_SEPARATOR_STRING); #endif - } global_module_path = path; global_module_path_set = true; |