Skip to main content
summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorDavid Inglis2006-06-15 16:02:10 +0000
committerDavid Inglis2006-06-15 16:02:10 +0000
commita94a0fef4947ab0e5a448ff37565105e2d7e14ac (patch)
treea5b2555726bda802157684bc6b40ab991752b0aa /build
parentb77acc0beeaa45d919387d63f2a629623db02b7b (diff)
downloadorg.eclipse.cdt-a94a0fef4947ab0e5a448ff37565105e2d7e14ac.tar.gz
org.eclipse.cdt-a94a0fef4947ab0e5a448ff37565105e2d7e14ac.tar.xz
org.eclipse.cdt-a94a0fef4947ab0e5a448ff37565105e2d7e14ac.zip
fixed for https://bugs.eclipse.org/bugs/show_bug.cgi?id=145602
Diffstat (limited to 'build')
-rw-r--r--build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeTarget.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeTarget.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeTarget.java
index bf3516c4525..9add2d54fa2 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeTarget.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeTarget.java
@@ -15,7 +15,6 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import org.eclipse.cdt.make.core.MakeBuilderUtil;
import org.eclipse.cdt.make.core.IMakeBuilderInfo;
import org.eclipse.cdt.make.core.IMakeCommonBuildInfo;
import org.eclipse.cdt.make.core.IMakeTarget;
@@ -173,7 +172,7 @@ public class MakeTarget extends PlatformObject implements IMakeTarget {
}
public IPath getBuildLocation() {
- return MakeBuilderUtil.getBuildDirectory(container.getProject(), container.getProjectRelativePath(), manager.getBuilderID(targetBuilderID));
+ return container.getLocation();
}
public void setBuildLocation(IPath location) throws CoreException {
@@ -294,7 +293,7 @@ public class MakeTarget extends PlatformObject implements IMakeTarget {
info.setEnvironment(getExpandedEnvironment());
info.setAppendEnvironment(appendEnvironment());
if (container != null) {
- info.setBuildAttribute(IMakeCommonBuildInfo.BUILD_LOCATION, getBuildLocation().toString());
+ info.setBuildAttribute(IMakeCommonBuildInfo.BUILD_LOCATION, container.getFullPath().toString());
}
IMakeBuilderInfo projectInfo = MakeCorePlugin.createBuildInfo(getProject(), builderID);
info.setErrorParsers(projectInfo.getErrorParsers());

Back to the top