From 8e687cb0d994568879a98a94585562294e3dea36 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Tue, 1 Aug 2023 18:43:11 -0700 Subject: [PATCH] CLI: remove --ambiguous-static-library Reverts 6232e63ca4460a953ca8453a6f7583eb910e87c8, but keeps the usage text cleanup. Let's resist adding this as long as possible. --- src/main.zig | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/main.zig b/src/main.zig index 907e6ab6e9..11b9514237 100644 --- a/src/main.zig +++ b/src/main.zig @@ -477,10 +477,6 @@ const usage_build_generic = \\ -l[lib], --library [lib] Link against system library (only if actually used) \\ -needed-l[lib], Link against system library (even if unused) \\ --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 \\ -search_paths_first For each library search path, check for dynamic \\ lib then static lib before proceeding to next path. @@ -1161,13 +1157,6 @@ fn buildOutputType( .preferred_mode = lib_preferred_mode orelse .Dynamic, .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")) { try clang_argv.append(arg); try clang_argv.append(args_iter.nextOrFatal());