From f9f7deaeda20b212ae4daea0009a904beccdf828 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Sun, 29 Mar 2020 20:58:59 -0400 Subject: [PATCH] linking against c++ does not trigger system library directories --- src/main.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index f5e7e03b37..05ba1ab40f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1371,15 +1371,17 @@ static int main0(int argc, char **argv) { return print_error_usage(arg0); } - bool any_non_c_link_libs = false; + bool any_system_lib_dependencies = false; for (size_t i = 0; i < link_libs.length; i += 1) { - if (!target_is_libc_lib_name(&target, link_libs.at(i))) { - any_non_c_link_libs = true; + if (!target_is_libc_lib_name(&target, link_libs.at(i)) && + !target_is_libcpp_lib_name(&target, link_libs.at(i))) + { + any_system_lib_dependencies = true; break; } } - if (target.is_native_os && any_non_c_link_libs) { + if (target.is_native_os && any_system_lib_dependencies) { Error err; Stage2NativePaths paths; if ((err = stage2_detect_native_paths(&paths))) {