From 09180c16d255c9386d0fd36bd97cc6dae0ee730e Mon Sep 17 00:00:00 2001
From: Joost Kraaijeveld <J.Kraaijeveld@Askesis.nl>
Date: Sun, 9 Feb 2020 12:19:10 +0100
Subject: [PATCH] Bug 535565 - LLVM/Clang Broken toolchain: finds wrong
 libraries and does not accept changes

Removed global LLVM-settings page
Removed automatic addition of libc++ and library path to project
settings

Change-Id: I0df65b7db73d7eb7360f7da224c326369589f882
Signed-off-by: Joost Kraaijeveld <J.Kraaijeveld@Askesis.nl>
---
 .../plugin.xml                                 |  9 ---------
 .../llvm/util/LlvmResourceListener.java        | 18 ------------------
 2 files changed, 27 deletions(-)

diff --git a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/plugin.xml b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/plugin.xml
index 64482ef87eb..8e18a2ae13d 100755
--- a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/plugin.xml
+++ b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/plugin.xml
@@ -5211,15 +5211,6 @@
          </configuration>
       </projectType>
    </extension>
-   <extension
-         point="org.eclipse.ui.preferencePages">
-      <page
-            category="org.eclipse.cdt.ui.preferences.CPluginPreferencePage"
-            class="org.eclipse.cdt.managedbuilder.llvm.ui.preferences.LlvmPreferencePage"
-            id="org.eclipse.cdt.managedbuilder.llvm.ui.preferences.LlvmPreferencePage"
-            name="%page.name">
-      </page>
-   </extension>
    <extension
          point="org.eclipse.core.runtime.preferences">
       <initializer
diff --git a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/util/LlvmResourceListener.java b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/util/LlvmResourceListener.java
index 10ceecfeb08..4138cbcfce1 100644
--- a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/util/LlvmResourceListener.java
+++ b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/util/LlvmResourceListener.java
@@ -15,7 +15,6 @@
  *******************************************************************************/
 package org.eclipse.cdt.managedbuilder.llvm.util;
 
-import org.eclipse.cdt.managedbuilder.llvm.ui.preferences.LlvmPreferenceStore;
 import org.eclipse.core.resources.IResourceChangeEvent;
 import org.eclipse.core.resources.IResourceChangeListener;
 
@@ -53,23 +52,6 @@ public class LlvmResourceListener implements IResourceChangeListener {
 			//					e.printStackTrace();
 			//				}
 			//			}
-		} else if (event.getType() == IResourceChangeEvent.PRE_BUILD) {
-			String os = System.getProperty("os.name").toLowerCase(); //$NON-NLS-1$
-			if (os.indexOf("win") >= 0) { //$NON-NLS-1$
-				LlvmPreferenceStore.addMinGWStdLib();
-				//				LlvmToolOptionPathUtil.addMissingCppIncludesForMingw(); //TODO: Remove when Scanner Discovery has been fixed
-			} else if (os.indexOf("nix") >= 0 || os.indexOf("nux") >= 0 /*|| os.indexOf( "mac") >=0 */) { //$NON-NLS-1$ //$NON-NLS-2$
-				LlvmPreferenceStore.addStdLibUnix();
-			}
-
-			/*
-			 * try to add values (include and library paths and libraries) to
-			 * projects's build configurations to ensure that newly added projects
-			 * have necessary paths.
-			 */
-			LlvmToolOptionPathUtil.addAllIncludesToBuildConf();
-			LlvmToolOptionPathUtil.addAllLibsToBuildConf();
-			LlvmToolOptionPathUtil.addAllLibPathsToBuildConf();
 		} else {
 			return;
 		}