Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build: don't change locale on smartos #21220

Closed
wants to merge 2 commits into from
Closed

build: don't change locale on smartos #21220

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
447efae
build: don't change locale on smartos
refack Jun 8, 2018
ed844ce
fixup! add reasoning
refack Jun 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,7 +672,8 @@ def get_xcode_version(cc):
def get_gas_version(cc):
try:
custom_env = os.environ.copy()
custom_env["LC_ALL"] = "en_US"
if 'sunos' not in sys.platform:
custom_env["LC_ALL"] = "en_US"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add a comment explaining why smartos is excluded?

proc = subprocess.Popen(shlex.split(cc) + ['-Wa,-v', '-c', '-o',
'/dev/null', '-x',
'assembler', '/dev/null'],
Expand All @@ -685,12 +686,13 @@ def get_gas_version(cc):
consider adjusting the CC environment variable if you installed
it in a non-standard prefix.''')

match = re.match(r"GNU assembler version ([2-9]\.[0-9]+)",
proc.communicate()[1])
gas_ret = proc.communicate()[1]
match = re.match(r"GNU assembler version ([2-9]\.[0-9]+)", gas_ret)

if match:
return match.group(1)
else:
warn('Could not recognize `gas`: ' + gas_ret)
return '0'

# Note: Apple clang self-reports as clang 4.2.0 and gcc 4.2.1. It passes
Expand Down