From a94a0fef4947ab0e5a448ff37565105e2d7e14ac Mon Sep 17 00:00:00 2001 From: David Inglis Date: Thu, 15 Jun 2006 16:02:10 +0000 Subject: [PATCH] fixed for https://bugs.eclipse.org/bugs/show_bug.cgi?id=145602 --- .../src/org/eclipse/cdt/make/internal/core/MakeTarget.java | 5 ++--- 1 file 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());