Merge branch 'fix-mistake-in-previous-pr' of https://github.com/Luflosi/kitty into master

This commit is contained in:
Kovid Goyal
2020-10-19 16:41:01 +05:30

View File

@@ -13,7 +13,6 @@ import shutil
import subprocess import subprocess
import sys import sys
import sysconfig import sysconfig
import tempfile
import time import time
from contextlib import suppress from contextlib import suppress
from functools import partial from functools import partial
@@ -214,19 +213,18 @@ def get_sanitize_args(cc: str, ccver: Tuple[int, int]) -> List[str]:
def test_compile(cc: str, *cflags: str, src: Optional[str] = None, lang: str = 'c') -> bool: def test_compile(cc: str, *cflags: str, src: Optional[str] = None, lang: str = 'c') -> bool:
src = src or 'int main(void) { return 0; }' src = src or 'int main(void) { return 0; }'
with tempfile.TemporaryDirectory() as tdir: p = subprocess.Popen(
p = subprocess.Popen( [cc] + list(cflags) + ['-x', lang, '-o', os.devnull, '-'],
[cc] + list(cflags) + ['-x', lang, '-o', os.devnull, '-'], cwd=tdir, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, stdin=subprocess.PIPE,
stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, stdin=subprocess.PIPE, )
) stdin = p.stdin
stdin = p.stdin assert stdin is not None
assert stdin is not None try:
try: stdin.write(src.encode('utf-8'))
stdin.write(src.encode('utf-8')) stdin.close()
stdin.close() except BrokenPipeError:
except BrokenPipeError: return False
return False return p.wait() == 0
return p.wait() == 0
def first_successful_compile(cc: str, *cflags: str, src: Optional[str] = None, lang: str = 'c') -> str: def first_successful_compile(cc: str, *cflags: str, src: Optional[str] = None, lang: str = 'c') -> str: