From 05454123d45ca9a5fc4578d4ebffec9b158cf089 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Fri, 19 Jul 2019 18:07:31 -0400 Subject: update clang driver code to llvm9 upstream commit 1931d3cb20a00da732c5210b123656632982fde0 --- src/zig_clang_driver.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/zig_clang_driver.cpp') diff --git a/src/zig_clang_driver.cpp b/src/zig_clang_driver.cpp index 39440f06a0..cc97b722d6 100644 --- a/src/zig_clang_driver.cpp +++ b/src/zig_clang_driver.cpp @@ -1,9 +1,8 @@ //===-- driver.cpp - Clang GCC-Compatible Driver --------------------------===// // -// The LLVM Compiler Infrastructure -// -// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details. +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // //===----------------------------------------------------------------------===// // @@ -339,7 +338,7 @@ int ZigClang_main(int argc_, const char **argv_) { // response files written by clang will tokenize the same way in either mode. bool ClangCLMode = false; if (StringRef(TargetAndMode.DriverMode).equals("--driver-mode=cl") || - std::find_if(argv.begin(), argv.end(), [](const char *F) { + llvm::find_if(argv, [](const char *F) { return F && strcmp(F, "--driver-mode=cl") == 0; }) != argv.end()) { ClangCLMode = true; @@ -510,4 +509,3 @@ int ZigClang_main(int argc_, const char **argv_) { // failing command. return Res; } - -- cgit v1.2.3