diff options
Diffstat (limited to 'org.rtems.cdt/src/org/rtems/cdt/build/CommandLineGenerator.java')
| -rw-r--r-- | org.rtems.cdt/src/org/rtems/cdt/build/CommandLineGenerator.java | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/org.rtems.cdt/src/org/rtems/cdt/build/CommandLineGenerator.java b/org.rtems.cdt/src/org/rtems/cdt/build/CommandLineGenerator.java index f4583d2..d64af68 100644 --- a/org.rtems.cdt/src/org/rtems/cdt/build/CommandLineGenerator.java +++ b/org.rtems.cdt/src/org/rtems/cdt/build/CommandLineGenerator.java @@ -38,7 +38,7 @@ public class CommandLineGenerator extends ManagedCommandLineGenerator implements public IManagedCommandLineInfo generateCommandLineInfo( ITool tool, String commandName, - String [] userOptions, + String [] options, String outputFlag, String outputPrefix, String outputName, @@ -74,11 +74,14 @@ public class CommandLineGenerator extends ManagedCommandLineGenerator implements commandName = Storage.getProperty( project, toolKey); tool.setToolCommand( commandName); - // Combine tool and user options - String [] toolOptions = Storage.getToolOptions( project, toolKey); - String options [] = new String [toolOptions.length + userOptions.length]; - System.arraycopy( toolOptions, 0, options, 0, toolOptions.length); - System.arraycopy( userOptions, 0, options, toolOptions.length, userOptions.length); + // Combine tool options and options + if (Storage.areToolOptionsEnabled( project)) { + String [] toolOptions = Storage.getToolOptions( project, toolKey); + String combinedOptions [] = new String [toolOptions.length + options.length]; + System.arraycopy( toolOptions, 0, combinedOptions, 0, toolOptions.length); + System.arraycopy( options, 0, combinedOptions, toolOptions.length, options.length); + options = combinedOptions; + } return super.generateCommandLineInfo( tool, |