From 562e46d7a405a7d24019b79547694403ee820b38 Mon Sep 17 00:00:00 2001 From: Erwin Waterlander Date: Fri, 10 Mar 2023 12:59:24 +0000 Subject: [PATCH] Issue #167 - Core Build Makefile project build output folder. * Issue Issue #167 was partly solved by PR #192 (commit 7911ac8a2b0). This change fixes the problem that after closing and opening a Makefile project the wrong build output location was used for the default Run configuration. The cause was that StandardBuildConfiguration.buildContainer was null after opening the project. * Fixed the problem that the output binary could not be found during launching when the user set the Build Output Location to "Build in project directory". Fixes #167 --- .../src/org/eclipse/cdt/make/core/MakefileProjectGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakefileProjectGenerator.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakefileProjectGenerator.java index 383ee98824f..7f2c9f9ab46 100644 --- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakefileProjectGenerator.java +++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakefileProjectGenerator.java @@ -84,7 +84,7 @@ public void generate(Map model, IProgressMonitor monitor) throws } } - entries.add(CoreModel.newOutputEntry(buildFolder.getFullPath())); + entries.add(CoreModel.newOutputEntry(project.getFullPath())); CoreModel.getDefault().create(project).setRawPathEntries(entries.toArray(new IPathEntry[entries.size()]), monitor); }