Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlain Magloire2004-03-02 04:53:20 +0000
committerAlain Magloire2004-03-02 04:53:20 +0000
commitdb744577770bc24d5ef3a38625962a83a2b847d7 (patch)
tree9a0a59c74afe19ac7bc964bd63a9f97d0a211599
parent74206bb9c0adfac164644b684d089bbdf8757013 (diff)
downloadorg.eclipse.cdt-db744577770bc24d5ef3a38625962a83a2b847d7.tar.gz
org.eclipse.cdt-db744577770bc24d5ef3a38625962a83a2b847d7.tar.xz
org.eclipse.cdt-db744577770bc24d5ef3a38625962a83a2b847d7.zip
Do not expand to empty if the macro is not found.
-rw-r--r--build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/AbstractMakefile.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/AbstractMakefile.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/AbstractMakefile.java
index b171e9f332a..8003dc94732 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/AbstractMakefile.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/AbstractMakefile.java
@@ -221,6 +221,8 @@ public abstract class AbstractMakefile extends Parent implements IMakefile {
result = expandString(result, recursive);
}
buffer.append(result);
+ } else { // Do not expand
+ buffer.append('$').append('(').append(name).append(')');
}
}
macroName.setLength(0);
@@ -244,6 +246,9 @@ public abstract class AbstractMakefile extends Parent implements IMakefile {
result = expandString(result, recursive);
}
buffer.append(result);
+ } else {
+ // nothing found
+ buffer.append('$').append(c);
}
inMacro = false;
} else {

Back to the top