summaryrefslogtreecommitdiff
path: root/wscript
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2009-02-26 18:59:15 +0000
committerDavid Robillard <d@drobilla.net>2009-02-26 18:59:15 +0000
commit4485edffae310e44dc990beff4fef773667df380 (patch)
treefc33ced056e9b15407895356537d4a31bd4792c6 /wscript
parent9e3b5711898a55150e7012b376707513be7bd353 (diff)
Another attempt at FLAC workaround.
git-svn-id: svn://localhost/ardour2/branches/3.0@4684 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'wscript')
-rw-r--r--wscript15
1 files changed, 2 insertions, 13 deletions
diff --git a/wscript b/wscript
index 899fb6a68a..b5ef9fabda 100644
--- a/wscript
+++ b/wscript
@@ -127,19 +127,8 @@ def configure(conf):
for i in children:
sub_config_and_use(conf, i)
- print conf.env['CCFLAGS']
- print conf.env['CXXFLAGS']
-
- # Fix utterly braindead FLAC include path
- for prefix in [ '/usr/include', '/usr/local/include' ]:
- for flags in [ conf.env['CCFLAGS'], conf.env['CXXFLAGS'] ]:
- for i in flags:
- if i == '-I' + prefix + '/FLAC':
- print '*** STRIPPED IDIOTIC FLAC INCLUDE PATH'
- flags.remove(i)
-
- print conf.env['CCFLAGS']
- print conf.env['CXXFLAGS']
+ # Fix utterly braindead FLAC include path to not smash assert.h
+ conf.env['CPPPATH_FLAC'] = []
autowaf.print_summary(conf)
opts = Options.options