From 38069d47ea254e55533de6abe6a7e1d022b577de Mon Sep 17 00:00:00 2001
From: Vasily Levchenko <vasily.v.levchenko@gmail.com>
Date: Mon, 25 Dec 2017 12:52:02 +0300
Subject: [PATCH] [build][gradle-4.4] (cpp, c) gradle plugins for native
 software injects -I/usr/include/x86_64-linux-gnu to compiler (#1189)

---
 Interop/Indexer/build.gradle | 4 ++++
 Interop/Runtime/build.gradle | 2 ++
 libclangext/build.gradle     | 2 ++
 llvmDebugInfoC/build.gradle  | 2 ++
 4 files changed, 10 insertions(+)

diff --git a/Interop/Indexer/build.gradle b/Interop/Indexer/build.gradle
index f5e59f843a3..1416541cc5b 100644
--- a/Interop/Indexer/build.gradle
+++ b/Interop/Indexer/build.gradle
@@ -88,9 +88,13 @@ model {
       eachPlatform {
         cppCompiler.withArguments { args ->
           args.remove "/usr/include"
+          if (isLinux())
+            args.remove "/usr/include/x86_64-linux-gnu"
         }
 	cCompiler.withArguments { args ->
           args.remove "/usr/include"
+          if (isLinux())
+            args.remove "/usr/include/x86_64-linux-gnu"
         }
       }
     }
diff --git a/Interop/Runtime/build.gradle b/Interop/Runtime/build.gradle
index 09fe90e3327..f0dd23a9bb7 100644
--- a/Interop/Runtime/build.gradle
+++ b/Interop/Runtime/build.gradle
@@ -47,6 +47,8 @@ model {
        eachPlatform {
          cCompiler.withArguments { args ->
            args.remove "/usr/include"
+           if (isLinux())
+             args.remove "/usr/include/x86_64-linux-gnu"
          }
        }
      }
diff --git a/libclangext/build.gradle b/libclangext/build.gradle
index 69fe773d851..110bbdbab2e 100644
--- a/libclangext/build.gradle
+++ b/libclangext/build.gradle
@@ -46,6 +46,8 @@ model {
       eachPlatform {
         cppCompiler.withArguments { args ->
           args.remove "/usr/include"
+          if (isLinux())
+            args.remove "/usr/include/x86_64-linux-gnu"
         }
       }
     }
diff --git a/llvmDebugInfoC/build.gradle b/llvmDebugInfoC/build.gradle
index a503139b2aa..9bf6e694cfc 100644
--- a/llvmDebugInfoC/build.gradle
+++ b/llvmDebugInfoC/build.gradle
@@ -40,6 +40,8 @@ model {
       eachPlatform {
         cppCompiler.withArguments { args ->
           args.remove "/usr/include"
+          if (isLinux())
+            args.remove "/usr/include/x86_64-linux-gnu"
         }
       }
     }