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

Fix for 66258 -- Cannot mix compilers anymore. Do not need to add the relative path to the name of the dependency file when using 'patsubst'

Browse source
This commit is contained in:
Sean Evoy 2004-06-09 19:14:54 +00:00
parent a3b99f7790
commit b4cff1eac6
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -290,7 +290,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator {
* @echo 'Building file: $<' * @echo 'Building file: $<'
* @echo <tool> <flags> <output_flag><output_prefix>$@ $< * @echo <tool> <flags> <output_flag><output_prefix>$@ $<
* @<tool> <flags> <output_flag><output_prefix>$@ $< && \ * @<tool> <flags> <output_flag><output_prefix>$@ $< && \
* echo -n '<relative_path>/' $(@:%.o=%.d) ' <relative_path>/' >> $(@:%.o=%.d) && \ * echo -n $(@:%.o=%.d) ' <relative_path>/' >> $(@:%.o=%.d) && \
* <tool> -P -MM -MG <flags> $< >> $(@:%.o=%.d) * <tool> -P -MM -MG <flags> $< >> $(@:%.o=%.d)
* @echo 'Finished building: $<' * @echo 'Finished building: $<'
* @echo ' ' * @echo ' '
@ -302,7 +302,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator {
* @echo 'Building file: $<' * @echo 'Building file: $<'
* @echo 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$@ $< && \ * @ g++ -g -O2 -c -I/cygdrive/c/eclipse/workspace/Project/headers -o$@ $< && \
* echo -n 'source1/'$(@:%.o=%.d) ' source1/' >> $(@:%.o=%.d) && \ * echo -n $(@:%.o=%.d) ' source1/' >> $(@:%.o=%.d) && \
* g++ -P -MM -MG -g -O2 -c -I/cygdrive/c/eclipse/workspace/Project/headers $< >> $(@:%.o=%.d) * g++ -P -MM -MG -g -O2 -c -I/cygdrive/c/eclipse/workspace/Project/headers $< >> $(@:%.o=%.d)
* @echo 'Finished building: $<' * @echo 'Finished building: $<'
* @echo ' ' * @echo ' '
@ -350,7 +350,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator {
buffer.append(WHITESPACE + LOGICAL_AND + WHITESPACE + LINEBREAK); buffer.append(WHITESPACE + LOGICAL_AND + WHITESPACE + LINEBREAK);
// TODO get the dep rule out of the tool // TODO get the dep rule out of the tool
String depRule = "$(@:%." + outputExtension + "=%." + DEP_EXT + ")"; String depRule = "$(@:%." + outputExtension + "=%." + DEP_EXT + ")";
buffer.append(TAB + ECHO + WHITESPACE + "-n" + WHITESPACE + SINGLE_QUOTE + relativePath + SINGLE_QUOTE + depRule + WHITESPACE + SINGLE_QUOTE + relativePath + SINGLE_QUOTE + WHITESPACE + ">" + WHITESPACE + depRule + WHITESPACE + LOGICAL_AND + WHITESPACE + LINEBREAK); //$NON-NLS-1$ //$NON-NLS-2$ buffer.append(TAB + ECHO + WHITESPACE + "-n" + WHITESPACE + depRule + WHITESPACE + SINGLE_QUOTE + relativePath + SINGLE_QUOTE + WHITESPACE + ">" + WHITESPACE + depRule + WHITESPACE + LOGICAL_AND + WHITESPACE + LINEBREAK); //$NON-NLS-1$ //$NON-NLS-2$
buffer.append(TAB + cmd + WHITESPACE + "-MM -MG -P -w" + WHITESPACE + buildFlags + WHITESPACE + IN_MACRO + WHITESPACE + ">>" + WHITESPACE + depRule); //$NON-NLS-1$ //$NON-NLS-2$ buffer.append(TAB + cmd + WHITESPACE + "-MM -MG -P -w" + WHITESPACE + buildFlags + WHITESPACE + IN_MACRO + WHITESPACE + ">>" + WHITESPACE + depRule); //$NON-NLS-1$ //$NON-NLS-2$
} }