From 30336cd9ba1a1c47c52edf69967457afd7967978 Mon Sep 17 00:00:00 2001 From: Thomas Nagy Date: Mon, 26 Oct 2015 22:44:39 +0100 Subject: [PATCH] Reverted the changes to conf.check(header_name=) as this causes regressions. Use conf.check(header_name=, link_header_test=False) - #1647 --- ChangeLog | 8 ++++++++ TODO | 1 + waflib/Tools/c_config.py | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index fbca48c6..d879a68a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +NEW IN WAF 1.8.16 +----------------- +* Reverted the changes to conf.check(header_name=) as this causes regressions. Use conf.check(header_name=, link_header_test=False) - #1647 +* Disabled the loading of c_emscripten when building from the Waf tree +* Fixed the documentation build when using Sphinx < 1.3 +* Propagate ldflags/LDFLAGS besides linkflags/LINKFLAGS +* Python3 fixes in extras/file_to_object.py + NEW IN WAF 1.8.15 ----------------- * Enabled multiple commands in run_str/rule diff --git a/TODO b/TODO index 3d6acf1b..6518d1c6 100644 --- a/TODO +++ b/TODO @@ -15,6 +15,7 @@ Waf 1.9 * Fix the vala detection * Better consistency between check_cfg and check_cc variables * Detect Clang by default on FreeBSD instead of gcc +* Use relative paths in apply_incpaths (and absolute ones when paths cross drives) and all other issues listed on https://github.com/waf-project/waf/issues diff --git a/waflib/Tools/c_config.py b/waflib/Tools/c_config.py index 9709648f..def45920 100644 --- a/waflib/Tools/c_config.py +++ b/waflib/Tools/c_config.py @@ -482,7 +482,7 @@ def validate_c(self, kw): kw['type'] = 'cprogram' if not 'features' in kw: - if not 'header_name' in kw: + if not 'header_name' in kw or kw.get('link_header_test', True): kw['features'] = [kw['compile_mode'], kw['type']] # "c ccprogram" else: kw['features'] = [kw['compile_mode']]