summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-build/ninja/files/ninja-cppflags.patch')
-rw-r--r--dev-build/ninja/files/ninja-cppflags.patch21
1 files changed, 0 insertions, 21 deletions
diff --git a/dev-build/ninja/files/ninja-cppflags.patch b/dev-build/ninja/files/ninja-cppflags.patch
deleted file mode 100644
index 375f6fce6045..000000000000
--- a/dev-build/ninja/files/ninja-cppflags.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Needed for append-lfs-flags to work.
---- a/configure.py
-+++ b/configure.py
-@@ -261,7 +261,7 @@ configure_args = sys.argv[1:]
- if '--bootstrap' in configure_args:
- configure_args.remove('--bootstrap')
- n.variable('configure_args', ' '.join(configure_args))
--env_keys = set(['CXX', 'AR', 'CFLAGS', 'CXXFLAGS', 'LDFLAGS'])
-+env_keys = set(['CXX', 'AR', 'CFLAGS', 'CPPFLAGS', 'CXXFLAGS', 'LDFLAGS'])
- configure_env = dict((k, os.environ[k]) for k in os.environ if k in env_keys)
- if configure_env:
- config_str = ' '.join([k + '=' + pipes.quote(configure_env[k])
-@@ -406,6 +406,8 @@ def shell_escape(str):
- if 'CFLAGS' in configure_env:
- cflags.append(configure_env['CFLAGS'])
- ldflags.append(configure_env['CFLAGS'])
-+if 'CPPFLAGS' in configure_env:
-+ cflags.append(configure_env['CPPFLAGS'])
- if 'CXXFLAGS' in configure_env:
- cflags.append(configure_env['CXXFLAGS'])
- ldflags.append(configure_env['CXXFLAGS'])