-
-
Notifications
You must be signed in to change notification settings - Fork 636
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
correct gcc to non-platform specific, but remove from osx for now
- Loading branch information
1 parent
dfe7340
commit aaae18c
Showing
8 changed files
with
49 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 31 additions & 0 deletions
31
src/python/pants/backend/python/subsystems/python_dist_build_environment.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
# 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) | ||
|
||
from pants.backend.native.subsystems.native_toolchain import NativeToolchain | ||
from pants.binaries.execution_environment_mixin import ExecutionEnvironmentMixin | ||
from pants.subsystem.subsystem import Subsystem | ||
from pants.util.memo import memoized_property | ||
|
||
|
||
class PythonDistBuildEnvironment(Subsystem, ExecutionEnvironmentMixin): | ||
|
||
options_scope = 'python-native-toolchain' | ||
|
||
@classmethod | ||
def subsystem_dependencies(cls): | ||
return super(PythonDistBuildEnvironment, cls).subsystem_dependencies() + (NativeToolchain.scoped(cls),) | ||
|
||
@memoized_property | ||
def _native_toolchain(self): | ||
return NativeToolchain.scoped_instance(self) | ||
|
||
def modify_environment(self, env): | ||
env = self._native_toolchain.modify_environment(env) | ||
env['CC'] = 'clang' | ||
env['CXX'] = 'clang++' | ||
env['ARCHFLAGS'] = '-arch x86_64' | ||
return env |
18 changes: 0 additions & 18 deletions
18
src/python/pants/backend/python/subsystems/python_native_extension_toolchain.py
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters