From f680519739ded84b25cbdfc6d45d3e6fee588d55 Mon Sep 17 00:00:00 2001 From: Morten Kristiansen Date: Tue, 17 Feb 2015 18:53:11 +0100 Subject: [PATCH] [Bug 460131] Eclipse bin dir prepended to cross tool path java.io.File is used to store the path to the cross tools. getAbsolutePath is invoked before variables are expanded. Hence File cannot see the path is already absolute and therefore prepends CWD. Reverted to getPath, since conversion to full path would not make sense anyway. Change-Id: I13e5b2c0d7747741926a88e120d13003b910e8c6 Signed-off-by: Morten Kristiansen --- .../build/crossgcc/CrossEnvironmentVariableSupplier.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100755 => 100644 cross/org.eclipse.cdt.build.crossgcc/src/org/eclipse/cdt/internal/build/crossgcc/CrossEnvironmentVariableSupplier.java diff --git a/cross/org.eclipse.cdt.build.crossgcc/src/org/eclipse/cdt/internal/build/crossgcc/CrossEnvironmentVariableSupplier.java b/cross/org.eclipse.cdt.build.crossgcc/src/org/eclipse/cdt/internal/build/crossgcc/CrossEnvironmentVariableSupplier.java old mode 100755 new mode 100644 index c29d7a56085..b5e83ea312e --- a/cross/org.eclipse.cdt.build.crossgcc/src/org/eclipse/cdt/internal/build/crossgcc/CrossEnvironmentVariableSupplier.java +++ b/cross/org.eclipse.cdt.build.crossgcc/src/org/eclipse/cdt/internal/build/crossgcc/CrossEnvironmentVariableSupplier.java @@ -78,7 +78,7 @@ public class CrossEnvironmentVariableSupplier implements } public String getValue() { - return path.getAbsolutePath(); + return path.getPath(); } }