authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-08-01 18:43:11-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-08-03 09:52:14-07:00
log8e687cb0d994568879a98a94585562294e3dea36
treeaed1a900133a43ee9ce95fd6e27c0071cb02dd25
parent89c605d140bf295e052cdded4e2c453f7a143d6f

CLI: remove --ambiguous-static-library

Reverts 6232e63ca4460a953ca8453a6f7583eb910e87c8, but keeps the usage text cleanup. Let's resist adding this as long as possible.

1 files changed, 0 insertions(+), 11 deletions(-)

src/main.zig-11
......@@ -477,10 +477,6 @@ const usage_build_generic =
477477 \\ -l[lib], --library [lib] Link against system library (only if actually used)
478478 \\ -needed-l[lib], Link against system library (even if unused)
479479 \\ --needed-library [lib]
480 \\ --ambiguous-static-library [l] Link against system library, checking for a
481 \\ static lib in each search path, then checking
482 \\ for a dynamic lib in each search path. Use of
483 \\ this CLI option is a code smell.
484480 \\ -L[d], --library-directory [d] Add a directory to the library search path
485481 \\ -search_paths_first For each library search path, check for dynamic
486482 \\ lib then static lib before proceeding to next path.
......@@ -1161,13 +1157,6 @@ fn buildOutputType(
11611157 .preferred_mode = lib_preferred_mode orelse .Dynamic,
11621158 .search_strategy = lib_search_strategy orelse .no_fallback,
11631159 });
1164 } else if (mem.eql(u8, arg, "--ambiguous-static-library")) {
1165 try system_libs.put(args_iter.nextOrFatal(), .{
1166 .needed = false,
1167 .weak = false,
1168 .preferred_mode = lib_preferred_mode orelse .Static,
1169 .search_strategy = lib_search_strategy orelse .mode_first,
1170 });
11711160 } else if (mem.eql(u8, arg, "-D")) {
11721161 try clang_argv.append(arg);
11731162 try clang_argv.append(args_iter.nextOrFatal());