Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Evoy2004-06-02 09:53:08 -0400
committerSean Evoy2004-06-02 09:53:08 -0400
commitaec08ee34da6010c28b0dcd9c5a40d9d0c15b35f (patch)
tree9aad08ac0e74daf557f432195df0367b24a19adb /build/org.eclipse.cdt.managedbuilder.core
parent4b91e1e3173338cd83a1433ce51762869ec368cb (diff)
downloadorg.eclipse.cdt-aec08ee34da6010c28b0dcd9c5a40d9d0c15b35f.tar.gz
org.eclipse.cdt-aec08ee34da6010c28b0dcd9c5a40d9d0c15b35f.tar.xz
org.eclipse.cdt-aec08ee34da6010c28b0dcd9c5a40d9d0c15b35f.zip
Fix for 65279 -- Spaces after the output flag in the makefile rules to build source
Diffstat (limited to 'build/org.eclipse.cdt.managedbuilder.core')
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java13
1 files changed, 8 insertions, 5 deletions
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 94599f72085..6d5eaa05ff7 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
@@ -312,7 +312,8 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator {
* Create the pattern rule in the format:
* <relative_path>/<name>.<outputExtension>: $(ROOT)/<relative_path>/<name>.<inputExtension>
* @echo 'Building file: $<'
- * @<tool> <flags> <output_flag> $@ $< && \
+ * @echo <tool> <flags> <output_flag><output_extension>$@ $<
+ * @<tool> <flags> <output_flag><output_extension>$@ $< && \
* echo -n '<relative_path>/<name>.d <relative_path>/' >> <relative_path>/<name>.d && \
* <tool> -P -MM -MG <flags> $< >> <relative_path>/<name>.d
* @echo 'Finished building: $<'
@@ -323,7 +324,8 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator {
* makefile, so a real command might look something like:
* source1/foo.o: $(ROOT)/source1/foo.cpp
* @echo 'Building file: $<'
- * @ g++ -g -O2 -c -I/cygdrive/c/eclipse/workspace/Project/headers -o $@ $< && \
+ * @echo g++ -g -O2 -c -I/cygdrive/c/eclipse/workspace/Project/headers -o$@ $<
+ * @ g++ -g -O2 -c -I/cygdrive/c/eclipse/workspace/Project/headers -o$@ $< && \
* echo -n 'source1/foo.d source1/' >> source1/foo.d && \
* g++ -P -MM -MG -g -O2 -c -I/cygdrive/c/eclipse/workspace/Project/headers $< >> source1/foo.d
* @echo 'Finished building: $<'
@@ -351,8 +353,9 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator {
outputPrefix = info.getOutputPrefix(outputExtension);
// The command to build
- buffer.append(TAB + AT + ECHO + WHITESPACE + cmd + WHITESPACE + buildFlags + WHITESPACE + outflag + WHITESPACE + outputPrefix + OUT_MACRO + WHITESPACE + IN_MACRO + NEWLINE);
- buffer.append(TAB + AT + cmd + WHITESPACE + buildFlags + WHITESPACE + outflag + WHITESPACE + outputPrefix + OUT_MACRO + WHITESPACE + IN_MACRO);
+ String buildCmd = cmd + WHITESPACE + buildFlags + WHITESPACE + outflag + outputPrefix + OUT_MACRO + WHITESPACE + IN_MACRO;
+ buffer.append(TAB + AT + ECHO + WHITESPACE + buildCmd + NEWLINE);
+ buffer.append(TAB + AT + buildCmd);
// TODO determine if there are any deps to calculate
if (true) {
@@ -576,7 +579,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator {
* Write out the target rule as:
* targ_<prefix><target>.<extension>: $(OBJS) <refd_project_1 ... refd_project_n>
* @echo 'Building target: $@'
- * $(BUILD_TOOL) $(FLAGS) $(OUTPUT_FLAG) $@ $(OBJS) $(USER_OBJS) $(LIB_DEPS)
+ * $(BUILD_TOOL) $(FLAGS) $(OUTPUT_FLAG)$@ $(OBJS) $(USER_OBJS) $(LIB_DEPS)
* @echo 'Finished building: $@'
* @echo
*/

Back to the top