mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2025-12-06 13:54:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

CLI: remove --ambiguous-static-library

Browse source 
Reverts 6232e63ca4460a953ca8453a6f7583eb910e87c8, but keeps the usage
text cleanup.

Let's resist adding this as long as possible.
This commit is contained in:
Andrew Kelley 2023-08-01 18:43:11 -07:00
parent 89c605d140
commit 8e687cb0d9
1 changed files with 0 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main.zig
View file

@ -477,10 +477,6 @@ const usage_build_generic =
\\ -l[lib], --library [lib] Link against system library (only if actually used) \\ -l[lib], --library [lib] Link against system library (only if actually used)
\\ -needed-l[lib], Link against system library (even if unused) \\ -needed-l[lib], Link against system library (even if unused)
\\ --needed-library [lib] \\ --needed-library [lib]
\\ --ambiguous-static-library [l] Link against system library, checking for a
\\ static lib in each search path, then checking
\\ for a dynamic lib in each search path. Use of
\\ this CLI option is a code smell.
\\ -L[d], --library-directory [d] Add a directory to the library search path \\ -L[d], --library-directory [d] Add a directory to the library search path
\\ -search_paths_first For each library search path, check for dynamic \\ -search_paths_first For each library search path, check for dynamic
\\ lib then static lib before proceeding to next path. \\ lib then static lib before proceeding to next path.
@ -1161,13 +1157,6 @@ fn buildOutputType(
.preferred_mode = lib_preferred_mode orelse .Dynamic, .preferred_mode = lib_preferred_mode orelse .Dynamic,
.search_strategy = lib_search_strategy orelse .no_fallback, .search_strategy = lib_search_strategy orelse .no_fallback,
}); });
} else if (mem.eql(u8, arg, "--ambiguous-static-library")) {
try system_libs.put(args_iter.nextOrFatal(), .{
.needed = false,
.weak = false,
.preferred_mode = lib_preferred_mode orelse .Static,
.search_strategy = lib_search_strategy orelse .mode_first,
});
} else if (mem.eql(u8, arg, "-D")) { } else if (mem.eql(u8, arg, "-D")) {
try clang_argv.append(arg); try clang_argv.append(arg);
try clang_argv.append(args_iter.nextOrFatal()); try clang_argv.append(args_iter.nextOrFatal());