Skip to main content
summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorJames Blackburn2010-05-19 08:22:46 -0400
committerJames Blackburn2010-05-19 08:22:46 -0400
commit2900e91389a162de7bac711990b2fc73ea729953 (patch)
treeb891f00ea2307319d11b26b4c6cf7a822e6b906e /build
parent37f471698abd3c2cc5789702d2c5a11fae6324b6 (diff)
downloadorg.eclipse.cdt-2900e91389a162de7bac711990b2fc73ea729953.tar.gz
org.eclipse.cdt-2900e91389a162de7bac711990b2fc73ea729953.tar.xz
org.eclipse.cdt-2900e91389a162de7bac711990b2fc73ea729953.zip
Bug 313503 Shouldn't pass empty "" arguments to tool options as it results in subsequent arguments being eaten
Diffstat (limited to 'build')
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Tool.java24
1 files changed, 4 insertions, 20 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 bfb178d1f0..65ba73dd57 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
@@ -2577,10 +2577,12 @@ public class Tool extends HoldsOptions implements ITool, IOptionCategory, IMatch
case IOption.STRING_LIST :
case IOption.INCLUDE_FILES :
+ case IOption.INCLUDE_PATH :
case IOption.LIBRARY_PATHS :
case IOption.LIBRARY_FILES :
case IOption.MACRO_FILES :
case IOption.UNDEF_INCLUDE_FILES :
+ case IOption.UNDEF_INCLUDE_PATH :
case IOption.UNDEF_LIBRARY_PATHS :
case IOption.UNDEF_LIBRARY_FILES :
case IOption.UNDEF_MACRO_FILES : {
@@ -2592,32 +2594,14 @@ public class Tool extends HoldsOptions implements ITool, IOptionCategory, IMatch
String[] list = CdtVariableResolver.resolveStringListValues(option.getBasicStringListValue(), macroSubstitutor, true);
if(list != null){
for (String temp : list) {
- if(temp.length() > 0)
+ if(temp.length() > 0 && !temp.equals(EMPTY_QUOTED_STRING))
sb.append( evaluateCommand( listCmd, temp ) + WHITE_SPACE );
}
}
}
}
break;
-
- case IOption.INCLUDE_PATH :
- case IOption.UNDEF_INCLUDE_PATH :{
- String incCmd = option.getCommand();
- IMacroContextInfo info = provider.getMacroContextInfo(IBuildMacroProvider.CONTEXT_FILE,
- new FileContextData(inputFileLocation, outputFileLocation, option, this));
- if(info != null) {
- macroSubstitutor.setMacroContextInfo(info);
- String[] paths = CdtVariableResolver.resolveStringListValues(option.getBasicStringListValue(), macroSubstitutor, true);
- if(paths != null){
- for (String temp : paths) {
- if(temp.length() > 0 && !temp.equals(EMPTY_QUOTED_STRING))
- sb.append( evaluateCommand( incCmd, temp ) + WHITE_SPACE);
- }
- }
- }
- }
- break;
-
+
case IOption.PREPROCESSOR_SYMBOLS :
case IOption.UNDEF_PREPROCESSOR_SYMBOLS :{
String defCmd = option.getCommand();

Back to the top