diff options
Diffstat (limited to 'src/tomo.c')
| -rw-r--r-- | src/tomo.c | 21 |
1 files changed, 5 insertions, 16 deletions
@@ -36,8 +36,8 @@ #include "stdlib/siphash.h" #include "stdlib/tables.h" #include "stdlib/text.h" -#include "stdlib/util.h" #include "types.h" +#include "util.h" #define run_cmd(...) \ ({ \ @@ -78,16 +78,15 @@ static List_t format_files = EMPTY_LIST, format_files_inplace = EMPTY_LIST, pars run_files = EMPTY_LIST, uninstall_libraries = EMPTY_LIST, libraries = EMPTY_LIST, args = EMPTY_LIST; static OptionalText_t show_codegen = NONE_TEXT, - cflags = Text("-Werror -fdollars-in-identifiers -std=c2x -Wno-trigraphs " + cflags = Text("-Werror -fdollars-in-identifiers -std=c2x -Wno-trigraphs" " -ffunction-sections -fdata-sections" - " -fno-signed-zeros " + " -fno-signed-zeros" " -D_XOPEN_SOURCE -D_DEFAULT_SOURCE -fPIC -ggdb" #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) " -D_BSD_SOURCE" #endif " -DGC_THREADS"), - ldlibs = Text("-lgc -lm -lgmp -lunistring"), ldflags = Text(""), optimization = Text("2"), - cc = Text(DEFAULT_C_COMPILER); + ldlibs = Text("-lm"), ldflags = Text(""), optimization = Text("2"), cc = Text(DEFAULT_C_COMPILER); static Text_t config_summary, // This will be either "" or "sudo -u <user>" or "doas -u <user>" @@ -527,16 +526,6 @@ void install_library(Path_t lib_dir) { xsystem(as_owner, "cp -r '", lib_dir, "'/* '", dest, "/'"); xsystem(as_owner, "cp -r '", lib_dir, "'/.build '", dest, "/'"); } - // If we have `debugedit` on this system, use it to remap the debugging source information - // to point to the installed version of the source file. Otherwise, fail silently. - if (verbose) whisper("Updating debug symbols for ", dest, "/lib", lib_name, ".a"); - int result = system(String(as_owner, "debugedit -b ", lib_dir, " -d '", dest, - "'" - " '", - dest, "/lib", lib_name, ".a", - "' " - ">/dev/null 2>/dev/null")); - (void)result; print("Installed \033[1m", lib_dir, "\033[m to ", TOMO_PATH, "/lib/tomo@", TOMO_VERSION, "/", lib_name); } @@ -953,7 +942,7 @@ Path_t compile_executable(env_t *base_env, Path_t path, Path_t exe_path, List_t // the libraries that are used. " ", is_gcc ? Texts("-Wl,--start-group ", list_text(archives), " -Wl,--end-group") : list_text(archives), // Tomo static library: - " ", TOMO_PATH, "/lib/libtomo@", TOMO_VERSION, ".a", + " -Wl,--no-whole-archive", " ", TOMO_PATH, "/lib/libtomo@", TOMO_VERSION, ".a", // Output file: " -o ", exe_path); |