Skip to main content
summaryrefslogtreecommitdiffstats
path: root/launch
diff options
context:
space:
mode:
authorJeff Johnston2019-04-17 11:29:02 -0400
committerJeff Johnston2019-04-23 16:20:27 -0400
commit98ab473c5f19bde83877199c88651f7acba86e9f (patch)
tree35a2445e02699f30177b5d6aaf6db05080a6e85a /launch
parentbf9575d365e3ccbe6f723236b0adc99a9b0717e9 (diff)
downloadorg.eclipse.cdt-98ab473c5f19bde83877199c88651f7acba86e9f.tar.gz
org.eclipse.cdt-98ab473c5f19bde83877199c88651f7acba86e9f.tar.xz
org.eclipse.cdt-98ab473c5f19bde83877199c88651f7acba86e9f.zip
Bug 546518 - Container gcc toolchain should just depend on path
- change ContainerGCCToolChain.getCommandPath() to just return the command - change default command to be gcc instead of /usr/bin/gcc Change-Id: I62869d974e7fc9707ee02dc6f5e2ab4500ddd0bc
Diffstat (limited to 'launch')
-rw-r--r--launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ui/launchbar/ContainerGCCToolChain.java10
1 files changed, 3 insertions, 7 deletions
diff --git a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ui/launchbar/ContainerGCCToolChain.java b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ui/launchbar/ContainerGCCToolChain.java
index dceb3f3a1e..afcd8d5669 100644
--- a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ui/launchbar/ContainerGCCToolChain.java
+++ b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ui/launchbar/ContainerGCCToolChain.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2015, 2017, 2018 QNX Software Systems and others.
+ * Copyright (c) 2015, 2019 QNX Software Systems and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -84,7 +84,7 @@ public class ContainerGCCToolChain extends PlatformObject implements IToolChain,
public ContainerGCCToolChain(String id, IToolChainProvider provider, Map<String, String> properties,
IEnvironmentVariable[] envVars) {
this.provider = provider;
- this.path = new File("/usr/bin/gcc").toPath(); //$NON-NLS-1$
+ this.path = new File("gcc").toPath(); //$NON-NLS-1$
// We include arch in the id since a compiler can support multiple arches.
StringBuilder idBuilder = new StringBuilder("container-gcc-"); //$NON-NLS-1$
@@ -475,11 +475,7 @@ public class ContainerGCCToolChain extends PlatformObject implements IToolChain,
@Override
public Path getCommandPath(Path command) {
- if (command.isAbsolute()) {
- return command;
- }
-
- return new File("/usr/bin/" + command).toPath(); //$NON-NLS-1$
+ return command;
}
private void initCompileCommands() {

Back to the top