From 9778eef9297c8f63de42554666c4fe1a63297ddb Mon Sep 17 00:00:00 2001
From: Alain Magloire <alain@qnx.com>
Date: Mon, 6 Jan 2003 22:02:49 +0000
Subject: [PATCH] Use expandEnvironment().

---
 .../launch/internal/LocalCLaunchConfigurationDelegate.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCLaunchConfigurationDelegate.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCLaunchConfigurationDelegate.java
index c63e78105c7..b9bc1de6675 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCLaunchConfigurationDelegate.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCLaunchConfigurationDelegate.java
@@ -24,7 +24,6 @@ import org.eclipse.cdt.debug.core.cdi.model.ICDITarget;
 import org.eclipse.cdt.launch.AbstractCLaunchDelegate;
 import org.eclipse.cdt.launch.ICDTLaunchConfigurationConstants;
 import org.eclipse.cdt.launch.internal.ui.LaunchUIPlugin;
-import org.eclipse.cdt.utils.spawner.EnvironmentReader;
 import org.eclipse.cdt.utils.spawner.ProcessFactory;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.ResourcesPlugin;
@@ -88,7 +87,7 @@ public class LocalCLaunchConfigurationDelegate extends AbstractCLaunchDelegate {
 					if (wd != null) {
 						opt.setWorkingDirectory(wd.getAbsolutePath());
 					}
-					opt.setEnvironment(getEnvironmentProperty(config));
+					opt.setEnvironment(expandEnvironment(config));
 					ICDITarget dtarget = dsession.getTargets()[0];
 					Process process = dtarget.getProcess();
 					IProcess iprocess = DebugPlugin.newProcess(launch, process, renderProcessLabel(commandArray[0]));
@@ -193,8 +192,8 @@ public class LocalCLaunchConfigurationDelegate extends AbstractCLaunchDelegate {
 	 */
 	protected Process exec(String[] cmdLine, Properties environ, File workingDirectory) throws CoreException {
 		Process p = null;
-		Properties props = EnvironmentReader.getEnvVars();
-		props.putAll(environ);
+		Properties props = getDefaultEnvironment();
+		props.putAll(expandEnvironment(environ));
 		String[] envp = null;
 		ArrayList envList = new ArrayList();
 		Enumeration names = props.propertyNames();