mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-29 20:05:35 +02:00
Code Issues Wiki Activity

Bug 574874 - Disable full gdb console support if running CDT in flatpak

Browse source 
- add check for flatpak environment variable in
  GDBBackend_7_12.isFullGdbConsoleSupported() method
  and return false if variable is set
- bump up org.eclipse.cdt.dsf.gdb version

Change-Id: I667a63395592e2671ab3bf6f255e7428371086b3
(cherry picked from commit d27126df9a)
This commit is contained in:
Jeff Johnston 2021-07-15 16:12:37 -04:00
parent dcbb2a51bb
commit da616bcc43
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dsf-gdb/org.eclipse.cdt.dsf.gdb/META-INF/MANIFEST.MF
View file

@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.cdt.dsf.gdb;singleton:=true
Bundle-Version: 6.4.0.qualifier
Bundle-Version: 6.4.1.qualifier
Bundle-Activator: org.eclipse.cdt.dsf.gdb.internal.GdbPlugin
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime,

5
dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBBackend_7_12.java
View file

@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2016 Ericsson and others.
* Copyright (c) 2016, 2021 Ericsson and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@ -59,7 +59,8 @@ public class GDBBackend_7_12 extends GDBBackend {
@Override
public boolean isFullGdbConsoleSupported() {
return !Platform.getOS().equals(Platform.OS_WIN32) && !Platform.getOS().equals(Platform.OS_MACOSX)
return System.getenv("FLATPAK_SANDBOX_DIR") == null //$NON-NLS-1$
&& !Platform.getOS().equals(Platform.OS_WIN32) && !Platform.getOS().equals(Platform.OS_MACOSX)
&& !fPtyFailure;
}