]>
Commit | Line | Data |
---|---|---|
0fc20b9a WF |
1 | diff -up fsplib-0.14/SConstruct.orig fsplib-0.14/SConstruct |
2 | --- fsplib-0.14/SConstruct.orig 2019-08-16 08:29:00.000000000 +0200 | |
3 | +++ fsplib-0.14/SConstruct 2023-06-04 13:37:10.122039427 +0200 | |
4 | @@ -11,8 +11,6 @@ PREFIX='/usr/local' | |
bff0d1ca JB |
5 | SHARED=0 |
6 | ||
7 | env = Environment() | |
8 | -# Turn CPPFLAGS to list | |
9 | -env.Append( CPPFLAGS = []) | |
10 | ||
0fc20b9a WF |
11 | ############## Imports ################# |
12 | from maintainer import checkForMaintainerMode | |
13 | @@ -40,6 +38,20 @@ def importEnv(list=None, prefix=None): | |
14 | kw={ 'ENV': kw } | |
15 | env.Append(**kw) | |
bff0d1ca JB |
16 | |
17 | +importEnv(['CPPFLAGS','CCFLAGS']) | |
18 | +if env['ENV'].get('CPPFLAGS'): | |
19 | + env.Append( CPPFLAGS = env['ENV'].get('CPPFLAGS').split() ) | |
20 | +elif ARGUMENTS.get('CPPFLAGS', 0): | |
21 | + env.Append( CPPFLAGS = ARGUMENTS.get('CPPFLAGS').split() ) | |
22 | +else: | |
23 | + env.Append( CPPFLAGS = []) | |
24 | +if env['ENV'].get('CFLAGS'): | |
25 | + env.Append( CCFLAGS = env['ENV'].get('CFLAGS').split() ) | |
26 | +elif ARGUMENTS.get('CFLAGS', 0): | |
27 | + env.Append( CCFLAGS = ARGUMENTS.get('CFLAGS').split() ) | |
28 | +else: | |
29 | + env.Append( CCFLAGS = []) | |
30 | + | |
31 | #import environment | |
32 | importEnv(['HOME','CC']) | |
33 | importEnv(prefix='DISTCC_') |