From c5adedd3697daa2c44ee9ab3f902e7f40a3b938f Mon Sep 17 00:00:00 2001 From: Doug Schaefer Date: Fri, 13 Jan 2006 01:07:05 +0000 Subject: [PATCH] Removed the PWD and CWD env vars from build. They were screwing up libtool under msys (pwd returned the env vars which had Windows \'ed paths). These shouldn't be needed. --- .../src/org/eclipse/cdt/make/core/MakeBuilder.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeBuilder.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeBuilder.java index 64deec6723d..891f49d1a32 100644 --- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeBuilder.java +++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeBuilder.java @@ -160,13 +160,11 @@ public class MakeBuilder extends ACBuilder { // Print the command for visual interaction. launcher.showCommand(true); - // Set the environmennt, some scripts may need the CWD var to be set. + // Set the environment HashMap envMap = new HashMap(); if (info.appendEnvironment()) { envMap.putAll(launcher.getEnvironment()); } - envMap.put("CWD", workingDirectory.toOSString()); //$NON-NLS-1$ - envMap.put("PWD", workingDirectory.toOSString()); //$NON-NLS-1$ // Add variables from build info envMap.putAll(info.getExpandedEnvironment()); Iterator iter = envMap.entrySet().iterator();