r302000 - Revert rL301998: "Fix a bug that -isysroot is completely ignored on Unix"

Yuka Takahashi via cfe-commits cfe-commits at lists.llvm.org
Tue May 2 23:02:45 PDT 2017


Author: yamaguchi
Date: Wed May  3 01:02:45 2017
New Revision: 302000

URL: http://llvm.org/viewvc/llvm-project?rev=302000&view=rev
Log:
Revert rL301998: "Fix a bug that -isysroot is completely ignored on Unix"

This reverts commit because it broke
sanitizer-x86_64-linux-autoconf bot and
clang-ppc64be-linux-multistage  bot.

Modified:
    cfe/trunk/lib/Frontend/CompilerInvocation.cpp
    cfe/trunk/test/Driver/sysroot-flags.c

Modified: cfe/trunk/lib/Frontend/CompilerInvocation.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/CompilerInvocation.cpp?rev=302000&r1=301999&r2=302000&view=diff
==============================================================================
--- cfe/trunk/lib/Frontend/CompilerInvocation.cpp (original)
+++ cfe/trunk/lib/Frontend/CompilerInvocation.cpp Wed May  3 01:02:45 2017
@@ -1565,7 +1565,7 @@ static void ParseHeaderSearchArgs(Header
     frontend::IncludeDirGroup Group = frontend::System;
     if (A->getOption().matches(OPT_internal_externc_isystem))
       Group = frontend::ExternCSystem;
-    Opts.AddPath(A->getValue(), Group, false, false);
+    Opts.AddPath(A->getValue(), Group, false, true);
   }
 
   // Add the path prefixes which are implicitly treated as being system headers.

Modified: cfe/trunk/test/Driver/sysroot-flags.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/sysroot-flags.c?rev=302000&r1=301999&r2=302000&view=diff
==============================================================================
--- cfe/trunk/test/Driver/sysroot-flags.c (original)
+++ cfe/trunk/test/Driver/sysroot-flags.c Wed May  3 01:02:45 2017
@@ -26,7 +26,3 @@
 // RUN:   FileCheck %s -check-prefix=SYSROOT_SEPARATE
 // SYSROOT_SEPARATE: "-isysroot" "{{[^"]*}}/foo/bar"
 // SYSROOT_SEPARATE: "--sysroot{{" "|=}}{{[^"]*}}/foo/bar"
-
-// Check that -isysroot is handled properly
-// RUN: %clang -isysroot /foo/bar -c %s -v 2>&1 | \
-// RUN:   grep "/foo/bar"




More information about the cfe-commits mailing list