diff options
| author | Doug Schaefer | 2016-08-25 19:52:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org | 2016-08-25 20:49:28 +0000 |
| commit | 50bc082f8413b14cd7f5c5c6b72b493c6e43539e (patch) | |
| tree | 37d90e309b5620586687398bd01cdd75978da3f8 /build/org.eclipse.cdt.build.gcc.core | |
| parent | 6cbe4a684917c9b7d04d23b9313bede705150b95 (diff) | |
| download | org.eclipse.cdt-50bc082f8413b14cd7f5c5c6b72b493c6e43539e.tar.gz org.eclipse.cdt-50bc082f8413b14cd7f5c5c6b72b493c6e43539e.tar.xz org.eclipse.cdt-50bc082f8413b14cd7f5c5c6b72b493c6e43539e.zip | |
Bug 174176 - Hook up CMake build to LaunchBar to select toolchain files
Use launch target os and cpu arch properties to pick toolchains and
toolchain files. UI to add toolchain files. And build support.
Also some clean up of Qt as I found bugs.
Change-Id: Icd1da43460b5954eea15e95ed8ec27850fc4e54e
Diffstat (limited to 'build/org.eclipse.cdt.build.gcc.core')
| -rw-r--r-- | build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java b/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java index 8354d8651bb..99c169e941a 100644 --- a/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java +++ b/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java @@ -378,7 +378,8 @@ public class GCCToolChain extends PlatformObject implements IToolChain { } // Look for it in the path environment var - String path = System.getenv("PATH"); //$NON-NLS-1$ + IEnvironmentVariable myPath = getVariable("PATH"); //$NON-NLS-1$ + String path = myPath != null ? myPath.getValue() : System.getenv("PATH"); //$NON-NLS-1$ for (String entry : path.split(File.pathSeparator)) { Path entryPath = Paths.get(entry); Path cmdPath = entryPath.resolve(command); |