Skip to content

Include system environment when debugging core build #1097

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Include system environment when debugging core build #1097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/ICBuildConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,9 @@ default IBinary[] getBuildOutput() throws CoreException {
* @param env
* build environment
* @since 6.1
* @implNote Ensure you pass a new non-empty map containing the base environment
* as this method modifies the passed in map adding the ICBuildConfiguration specific
* overrides, such as applying the project's build environment.
*/
default void setBuildEnvironment(Map<String, String> env) {
}
Expand Down
17 changes: 14 additions & 3 deletions ...gdb/src/org/eclipse/cdt/dsf/gdb/internal/launching/CoreBuildLocalDebugLaunchDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import org.eclipse.cdt.dsf.gdb.service.GdbDebugServicesFactory;
import org.eclipse.cdt.dsf.gdb.service.command.IGDBControl;
import org.eclipse.cdt.dsf.service.DsfServicesTracker;
import org.eclipse.cdt.utils.spawner.EnvironmentReader;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
Expand Down Expand Up @@ -76,10 +77,20 @@ public void launch(ILaunchConfiguration configuration, String mode, ILaunch laun
ILaunchTarget target = ((ITargetedLaunch) launch).getLaunchTarget();
ICBuildConfiguration buildConfig = getBuildConfiguration(configuration, mode, target, monitor);

Map<String, String> buildEnv = new HashMap<>();
buildConfig.setBuildEnvironment(buildEnv);
Map<String, String> systemEnv = new HashMap<>();
Properties environmentVariables = EnvironmentReader.getEnvVars();
for (String key : environmentVariables.stringPropertyNames()) {
String value = environmentVariables.getProperty(key);
systemEnv.put(key, value);
}

var before = new HashMap<>(systemEnv);
buildConfig.setBuildEnvironment(systemEnv);

before.forEach((k, v) -> systemEnv.remove(k, v));

Properties envProps = new Properties();
envProps.putAll(buildEnv);
envProps.putAll(systemEnv);
gdbLaunch.setInitialEnvironment(envProps);

String debugger = configuration.getAttribute(IGDBLaunchConfigurationConstants.ATTR_DEBUG_NAME,
Expand Down
Loading