DHBW
/
gemstone
mirror of https://github.com/Servostar/gemstone.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added custom import and link paths to build.toml

This commit is contained in:
Sven Vogel 2024-07-18 21:59:29 +02:00
parent 46d47ce9d7
commit 056c62acad
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/cfg/opt.c
View File

@ -103,7 +103,7 @@ TargetConfig* default_target_config() {
config->output_directory = mem_strdup(MemoryNamespaceOpt, "bin"); config->output_directory = mem_strdup(MemoryNamespaceOpt, "bin");
config->optimization_level = 1; config->optimization_level = 1;
config->root_module = NULL; config->root_module = NULL;
config->link_search_paths = g_array_new(FALSE, FALSE, sizeof(char*)); config->link_search_paths = mem_new_g_array(MemoryNamespaceOpt, sizeof(char*));
config->lld_fatal_warnings = FALSE; config->lld_fatal_warnings = FALSE;
config->gsc_fatal_warnings = FALSE; config->gsc_fatal_warnings = FALSE;
config->import_paths = mem_new_g_array(MemoryNamespaceOpt, sizeof(char*)); config->import_paths = mem_new_g_array(MemoryNamespaceOpt, sizeof(char*));
@ -311,6 +311,21 @@ static void get_int(int* integer, const toml_table_t *table, const char* name) {
} }
} }
static void get_array(GArray* array, const toml_table_t *table, const char* name) {
const toml_array_t* toml_array = toml_array_in(table, name);
if (toml_array) {
for (int i = 0; i < toml_array_nelem(toml_array); i++) {
toml_datum_t value = toml_string_at(toml_array, i);
if (value.ok) {
char* copy = mem_strdup(MemoryNamespaceOpt, value.u.s);
g_array_append_val(array, copy);
}
}
}
}
static int parse_project_table(ProjectConfig *config, const toml_table_t *project_table) { static int parse_project_table(ProjectConfig *config, const toml_table_t *project_table) {
DEBUG("parsing project table..."); DEBUG("parsing project table...");
@ -387,6 +402,13 @@ static int parse_target(const ProjectConfig *config, const toml_table_t *target_
if (err != PROJECT_OK) { if (err != PROJECT_OK) {
return err; return err;
} }
char* cwd = g_get_current_dir();
g_array_append_val(target_config->link_search_paths, cwd);
get_array(target_config->link_search_paths, target_table, "link-paths");
g_array_append_val(target_config->import_paths, cwd);
get_array(target_config->import_paths, target_table, "import-paths");
g_hash_table_insert(config->targets, target_config->name, target_config); g_hash_table_insert(config->targets, target_config->name, target_config);

2
src/llvm/link/lld.c
View File

@ -13,6 +13,8 @@ const char* get_absolute_link_path(const TargetConfig* config, const char* link_
for (guint i = 0; i < config->link_search_paths->len; i++) { for (guint i = 0; i < config->link_search_paths->len; i++) {
const char* link_directory_path = g_array_index(config->link_search_paths, char*, i); const char* link_directory_path = g_array_index(config->link_search_paths, char*, i);
INFO("searching at: %s", link_directory_path);
char* path = g_build_filename(link_directory_path, link_target_name, NULL); char* path = g_build_filename(link_directory_path, link_target_name, NULL);
char* cwd = g_get_current_dir(); char* cwd = g_get_current_dir();
char* canonical = g_canonicalize_filename(path, cwd); char* canonical = g_canonicalize_filename(path, cwd);