diff --git a/tests/wscript b/tests/wscript
index 3b9c204..4a41372 100644
--- a/tests/wscript
+++ b/tests/wscript
@@ -34,7 +34,7 @@ def build(bld):
     if env['CXX']:
         obj = bld.new_task_gen('cxx', 'objects', 'pyext')
         obj.source = 'test.cc'
-        if os.path.basename(obj.env['CXX']).startswith("g++"):
+        if env['CXX_NAME'] == 'gcc':
             obj.env.append_value('CXXFLAGS', ['-Werror', '-Wno-unused'])
     
     ## manual code generation using simple pybindgen API calls
diff --git a/wscript b/wscript
index ebe2cd0..c70b6e3 100644
--- a/wscript
+++ b/wscript
@@ -3,6 +3,8 @@
 
 import Options
 import Build
+
+import Configure
 Configure.autoconfig = True
 import Logs
 
@@ -15,6 +17,9 @@ import sys
 import Configure
 import tarfile
 
+import Task
+Task.file_deps = Task.extract_deps
+
 
 APPNAME='pybindgen'
 srcdir = '.'
@@ -170,9 +175,6 @@ def configure(conf):
         conf.env['CXX'] = ''
     else:
         conf.check_tool('cflags')
-        if os.path.basename(conf.env['CXX']).startswith("g++"):
-            conf.env.append_value('CXXFLAGS', ['-Wall', '-fno-strict-aliasing'])
-            conf.env.append_value('CXXFLAGS', ['-Wextra'])
         conf.check_python_headers()
 
         if not Options.options.disable_pygccxml: