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 =...@@ -477,10 +477,6 @@ const usage_build_generic =
477 \\ -l[lib], --library [lib] Link against system library (only if actually used)477 \\ -l[lib], --library [lib] Link against system library (only if actually used)
478 \\ -needed-l[lib], Link against system library (even if unused)478 \\ -needed-l[lib], Link against system library (even if unused)
479 \\ --needed-library [lib]479 \\ --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.
484 \\ -L[d], --library-directory [d] Add a directory to the library search path480 \\ -L[d], --library-directory [d] Add a directory to the library search path
485 \\ -search_paths_first For each library search path, check for dynamic481 \\ -search_paths_first For each library search path, check for dynamic
486 \\ lib then static lib before proceeding to next path.482 \\ lib then static lib before proceeding to next path.
...@@ -1161,13 +1157,6 @@ fn buildOutputType(...@@ -1161,13 +1157,6 @@ fn buildOutputType(
1161 .preferred_mode = lib_preferred_mode orelse .Dynamic,1157 .preferred_mode = lib_preferred_mode orelse .Dynamic,
1162 .search_strategy = lib_search_strategy orelse .no_fallback,1158 .search_strategy = lib_search_strategy orelse .no_fallback,
1163 });1159 });
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 });
1171 } else if (mem.eql(u8, arg, "-D")) {1160 } else if (mem.eql(u8, arg, "-D")) {
1172 try clang_argv.append(arg);1161 try clang_argv.append(arg);
1173 try clang_argv.append(args_iter.nextOrFatal());1162 try clang_argv.append(args_iter.nextOrFatal());