diff options
| author | Bruce Hill <bruce@bruce-hill.com> | 2025-09-01 17:39:20 -0400 |
|---|---|---|
| committer | Bruce Hill <bruce@bruce-hill.com> | 2025-09-01 17:39:20 -0400 |
| commit | 2538b1b7461f9b06d6a6f43acd5609d916b1addc (patch) | |
| tree | 061efdfc54351b1c644f1422e4f2c00bfefb1235 /src/compile | |
| parent | d6d3f5711de85ab1c21f515b9d125d316d853c92 (diff) | |
| parent | adc2d81b5683e611c5f3289be6157d4519a60632 (diff) | |
Merge branch 'main' into formatter
Diffstat (limited to 'src/compile')
| -rw-r--r-- | src/compile/headers.c | 6 | ||||
| -rw-r--r-- | src/compile/statements.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/compile/headers.c b/src/compile/headers.c index 8c0863ee..6dc69f03 100644 --- a/src/compile/headers.c +++ b/src/compile/headers.c @@ -174,10 +174,10 @@ Text_t compile_statement_type_header(env_t *env, Path_t header_path, ast_t *ast) module_info_t mod = get_module_info(ast); glob_t tm_files; const char *folder = mod.version ? String(mod.name, "_", mod.version) : mod.name; - if (glob(String(TOMO_PREFIX "/share/tomo_" TOMO_VERSION "/installed/", folder, "/[!._0-9]*.tm"), GLOB_TILDE, - NULL, &tm_files) + if (glob(String(TOMO_PATH, "/lib/tomo_" TOMO_VERSION "/", folder, "/[!._0-9]*.tm"), GLOB_TILDE, NULL, + &tm_files) != 0) { - if (!try_install_module(mod)) code_err(ast, "Could not find library"); + if (!try_install_module(mod, true)) code_err(ast, "Could not find library"); } Text_t includes = EMPTY_TEXT; diff --git a/src/compile/statements.c b/src/compile/statements.c index e296795b..a7c5214a 100644 --- a/src/compile/statements.c +++ b/src/compile/statements.c @@ -204,10 +204,10 @@ static Text_t _compile_statement(env_t *env, ast_t *ast) { module_info_t mod = get_module_info(ast); glob_t tm_files; const char *folder = mod.version ? String(mod.name, "_", mod.version) : mod.name; - if (glob(String(TOMO_PREFIX "/share/tomo_" TOMO_VERSION "/installed/", folder, "/[!._0-9]*.tm"), GLOB_TILDE, - NULL, &tm_files) + if (glob(String(TOMO_PATH, "/lib/tomo_" TOMO_VERSION "/", folder, "/[!._0-9]*.tm"), GLOB_TILDE, NULL, + &tm_files) != 0) { - if (!try_install_module(mod)) code_err(ast, "Could not find library"); + if (!try_install_module(mod, true)) code_err(ast, "Could not find library"); } Text_t initialization = EMPTY_TEXT; |