summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiviu Ionescu2013-10-24 11:00:33 (EDT)
committerAndrew Gvozdev2013-11-02 16:03:37 (EDT)
commit6c8e4c45f4215bf4211f5442fde427a699312bef (patch)
tree64a1d5ad4cb7dd9906d4b20ac132872936b26661
parent568d99f7b485eb228d0ff4eb325caeb6cc7f5129 (diff)
downloadorg.eclipse.cdt-6c8e4c45f4215bf4211f5442fde427a699312bef.zip
org.eclipse.cdt-6c8e4c45f4215bf4211f5442fde427a699312bef.tar.gz
org.eclipse.cdt-6c8e4c45f4215bf4211f5442fde427a699312bef.tar.bz2
Bug 322168: source files with specific settings disable secondaryrefs/changes/35/17735/4
outputs Change-Id: I86caab2a842ef821606cf589c194b8deee91c5ec Signed-off-by: Liviu Ionescu <ilg@livius.net> Reviewed-on: https://git.eclipse.org/r/17735 Tested-by: Hudson CI Reviewed-by: Andrew Gvozdev <angvoz.dev@gmail.com> IP-Clean: Andrew Gvozdev <angvoz.dev@gmail.com> Tested-by: Andrew Gvozdev <angvoz.dev@gmail.com>
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Tool.java2
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java8
2 files changed, 9 insertions, 1 deletions
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Tool.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Tool.java
index 93b00d7..1d8e5d8 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Tool.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Tool.java
@@ -9,6 +9,7 @@
* IBM - Initial API and implementation
* Baltasar Belyavsky (Texas Instruments) - [279633] Custom option command-generator support
* Miwako Tokugawa (Intel Corporation) - bug 222817 (OptionCategoryApplicability)
+ * Liviu Ionescu - [322168]
*******************************************************************************/
package org.eclipse.cdt.managedbuilder.internal.core;
@@ -4047,6 +4048,7 @@ public class Tool extends HoldsOptions implements ITool, IOptionCategory, IMatch
// find matching option
try {
if (op1.getValueType() == op2.getValueType() &&
+ op1.getName() != null &&
op1.getName().equals(op2.getName())) {
Object ob1 = op1.getValue();
Object ob2 = op2.getValue();
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java
index 8c275d9..8f3d7ef 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java
@@ -12,6 +12,7 @@
* Anna Dushistova (Mentor Graphics) - [307244] extend visibility of fields in GnuMakefileGenerator
* James Blackburn (Broadcom Corp.)
* Marc-Andre Laperle
+ * Liviu Ionescu - [322168]
*******************************************************************************/
package org.eclipse.cdt.managedbuilder.makegen.gnu;
@@ -4013,7 +4014,12 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator2 {
Set<Entry<String, List<IPath>>> set = buildOutVars.entrySet();
for (Entry<String, List<IPath>> entry : set) {
String macroName = entry.getKey();
- addMacroAdditionPrefix(map, macroName, "", false); //$NON-NLS-1$
+
+ // for projects with specific setting on folders/files do
+ // not clear the macro value on subsequent passes
+ if (!map.containsKey(macroName)) {
+ addMacroAdditionPrefix(map, macroName, "", false); //$NON-NLS-1$
+ }
}
// Set of input extensions for which macros have been created so far