1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
commit 41056d132ae772b3c050020d68b7daa585e4143c
Author: Louis Sautier <sautier.louis@gmail.com>
Date: Thu Sep 9 13:29:37 2021 +0200
Never hardcode compiler, select it based on CC environment variable
diff --git a/SConstruct b/SConstruct
index 7e12d413..20b080da 100755
--- a/SConstruct
+++ b/SConstruct
@@ -37,8 +37,9 @@ Export('VERSION_MAJOR VERSION_MINOR VERSION_PATCH VERSION_NAME')
def check_gcc_version(context):
context.Message('Checking for GCC version... ')
+ gcc = os.environ.get("CC", "gcc")
try:
- v = subprocess.check_output("printf '%s\n' __GNUC__ | gcc -E -P -", shell=True)
+ v = subprocess.check_output("printf '%s\n' __GNUC__ | {} -E -P -".format(gcc), shell=True)
try:
v = int(v)
context.Result(str(v))
diff --git a/tests/test_types/test_nonstripped.py b/tests/test_types/test_nonstripped.py
index a18648c9..d3190d1b 100644
--- a/tests/test_types/test_nonstripped.py
+++ b/tests/test_types/test_nonstripped.py
@@ -21,8 +21,12 @@ def create_binary(path, stripped=False):
path = path + '.stripped' if stripped else path + '.nonstripped'
full_path = os.path.join(TESTDIR_NAME, path)
- command = 'echo \'{src}\' | cc -o {path} {option} -std=c99 -xc -'.format(
- src=SOURCE, path=full_path, option=('-s' if stripped else '-ggdb3')
+ cc = os.environ.get("CC", "cc")
+ command = 'echo \'{src}\' | {cc} -o {path} {option} -std=c99 -xc -'.format(
+ cc=cc,
+ src=SOURCE,
+ path=full_path,
+ option=('-s' if stripped else '-ggdb3')
)
subprocess.call(command, shell=True)
|
GitWeb
