mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-24 09:25:31 +02:00
Code Issues Wiki Activity

Bug 322168: source files with specific settings disable secondary

Browse source 
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>
This commit is contained in:
Liviu Ionescu 2013-10-24 18:00:33 +03:00 • committed by Andrew Gvozdev
parent 568d99f7b4
commit 6c8e4c45f4
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Tool.java
View file

@ -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();

8
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java
View file

@ -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