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
41
42
43
|
Description: add -isystem support to scons
Author: James McCoy <jamessan@debian.org>
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=760804
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=761565
Forwarded: https://bitbucket.org/scons/scons/pull-request/184/support-isystem-in-parseflags/diff
Last-Update: 2014-09-16
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: trunk/scons.1
===================================================================
--- trunk.orig/scons.1 2014-09-16 07:55:07.618419159 +0200
+++ trunk/scons.1 2014-09-16 07:55:07.550416614 +0200
@@ -8549,6 +8549,7 @@
\-framework FRAMEWORKS
\-frameworkdir= FRAMEWORKPATH
\-include CCFLAGS
+\-isystem CPPFLAGS
\-isysroot CCFLAGS, LINKFLAGS
\-I CPPPATH
\-l LIBS
Index: trunk/engine/SCons/Environment.py
===================================================================
--- trunk.orig/engine/SCons/Environment.py 2014-09-15 20:30:32.000000000 +0200
+++ trunk/engine/SCons/Environment.py 2014-09-16 07:57:55.260656356 +0200
@@ -719,6 +719,9 @@
t = ('-isysroot', arg)
dict['CCFLAGS'].append(t)
dict['LINKFLAGS'].append(t)
+ elif append_next_arg_to == '-isystem':
+ t = ('-isystem', arg)
+ dict['CCFLAGS'].append(t)
elif append_next_arg_to == '-arch':
t = ('-arch', arg)
dict['CCFLAGS'].append(t)
@@ -791,7 +794,7 @@
elif arg[0] == '+':
dict['CCFLAGS'].append(arg)
dict['LINKFLAGS'].append(arg)
- elif arg in ['-include', '-isysroot', '-arch']:
+ elif arg in ['-include', '-isysroot', '-isystem', '-arch']:
append_next_arg_to = arg
else:
dict['CCFLAGS'].append(arg)
|
