unremove gcc

src/python/pants/backend/native/subsystems/gcc.py

@@ -0,0 +1,19 @@
+# coding=utf-8
+# Copyright 2018 Pants project contributors (see CONTRIBUTORS.md).
+# Licensed under the Apache License, Version 2.0 (see LICENSE).
+
+from __future__ import (absolute_import, division, generators, nested_scopes, print_function,
+                        unicode_literals, with_statement)
+
+import os
+
+from pants.binaries.binary_tool import ExecutablePathProvider, NativeTool
+
+
+class GCC(NativeTool, ExecutablePathProvider):
+  options_scope = 'gcc'
+  default_version = '7.3.0'
+  archive_type = 'tgz'
+
+  def path_entries(self):
+    return [os.path.join(self.select(), 'bin')]

src/python/pants/backend/native/subsystems/native_toolchain.py

@@ -5,7 +5,8 @@
 from __future__ import (absolute_import, division, generators, nested_scopes, print_function,
                         unicode_literals, with_statement)
 
-from pants.backend.native.subsystems.llvm import LLVM
+from pants.backend.native.subsystems.clang import Clang
+from pants.backend.native.subsystems.gcc import GCC
 from pants.backend.native.subsystems.platform_specific.darwin.xcode_cli_tools import XCodeCLITools
 from pants.backend.native.subsystems.platform_specific.linux.binutils import Binutils
 from pants.binaries.binary_tool import ExecutablePathProvider
@@ -40,7 +41,7 @@ class NativeToolchain(Subsystem, ExecutablePathProvider):
 
   # This is a list of subsystems which implement `ExecutablePathProvider` and
   # can be provided for all supported platforms.
-  _CROSS_PLATFORM_SUBSYSTEMS = [LLVM]
+  _CROSS_PLATFORM_SUBSYSTEMS = [Clang, GCC]
 
   # This is a map of {<platform> -> [<subsystem_cls>, ...]}; the key is the
   # normalized OS name, and the value is a list of subsystem class objects that

src/python/pants/backend/python/tasks/setup_py.py

@@ -92,7 +92,8 @@ def as_env_dict(self):
 
 @rule(SetupPyInvocationEnvironment, [Select(NativeToolchain)])
 def get_setup_py_env(native_toolchain):
-  joined_path = get_joined_path(native_toolchain.path_entries())
+  joined_path = get_joined_path(
+    native_toolchain.path_entries(), os.environ.copy())
   return SetupPyInvocationEnvironment(joined_path)