[PATCH 1/4] makefiles: Use -fno-builtin for CRT tests.

[Piotr Caban]

From: Piotr Caban

---
 dlls/msvcr100/tests/Makefile.in | 1 -
 dlls/msvcr110/tests/Makefile.in | 1 -
 dlls/msvcr120/tests/Makefile.in | 1 -
 dlls/msvcr70/tests/Makefile.in  | 1 -
 dlls/msvcr71/tests/Makefile.in  | 1 -
 dlls/ucrtbase/tests/Makefile.in | 1 -
 tools/makedep.c                 | 7 +++++--
 7 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/dlls/msvcr100/tests/Makefile.in b/dlls/msvcr100/tests/Makefile.in
index 5421b85f2ef..3661c0e4867 100644
--- a/dlls/msvcr100/tests/Makefile.in
+++ b/dlls/msvcr100/tests/Makefile.in
@@ -1,6 +1,5 @@
 TESTDLL   = msvcr100.dll
 IMPORTS   = msvcr100
-EXTRADEFS = -fno-builtin

SOURCES = \
    msvcr100.c
diff --git a/dlls/msvcr110/tests/Makefile.in b/dlls/msvcr110/tests/Makefile.in
index f7a00bd91b9..828c6bad449 100644
--- a/dlls/msvcr110/tests/Makefile.in
+++ b/dlls/msvcr110/tests/Makefile.in
@@ -1,6 +1,5 @@
 TESTDLL   = msvcr110.dll
 IMPORTS   = msvcr110
-EXTRADEFS = -fno-builtin

SOURCES = \
    msvcr110.c
diff --git a/dlls/msvcr120/tests/Makefile.in b/dlls/msvcr120/tests/Makefile.in
index 6aca444fba5..05d3558986e 100644
--- a/dlls/msvcr120/tests/Makefile.in
+++ b/dlls/msvcr120/tests/Makefile.in
@@ -1,6 +1,5 @@
 TESTDLL   = msvcr120.dll
 IMPORTS   = msvcr120
-EXTRADEFS = -fno-builtin

SOURCES = \
    msvcr120.c
diff --git a/dlls/msvcr70/tests/Makefile.in b/dlls/msvcr70/tests/Makefile.in
index 2e5a78c0571..49bc95ba1dd 100644
--- a/dlls/msvcr70/tests/Makefile.in
+++ b/dlls/msvcr70/tests/Makefile.in
@@ -1,6 +1,5 @@
 TESTDLL   = msvcr70.dll
 IMPORTS   = msvcr70
-EXTRADEFS = -fno-builtin

SOURCES = \
    msvcr70.c
diff --git a/dlls/msvcr71/tests/Makefile.in b/dlls/msvcr71/tests/Makefile.in
index eb45e6df2f7..fe5f34f3475 100644
--- a/dlls/msvcr71/tests/Makefile.in
+++ b/dlls/msvcr71/tests/Makefile.in
@@ -1,6 +1,5 @@
 TESTDLL   = msvcr71.dll
 IMPORTS   = msvcr71
-EXTRADEFS = -fno-builtin

SOURCES = \
    msvcr71.c
diff --git a/dlls/ucrtbase/tests/Makefile.in b/dlls/ucrtbase/tests/Makefile.in
index ea9e589113c..f627d155fe5 100644
--- a/dlls/ucrtbase/tests/Makefile.in
+++ b/dlls/ucrtbase/tests/Makefile.in
@@ -1,6 +1,5 @@
 TESTDLL   = ucrtbase.dll
 IMPORTS   = ucrtbase
-EXTRADEFS = -fno-builtin

SOURCES = \
    cpp.c \
diff --git a/tools/makedep.c b/tools/makedep.c
index e80c829e7ba..29f6d6f7a00 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -3285,14 +3285,17 @@ static void output_source_one_arch( struct makefile *make, struct incl_file *sou
         {
             strarray_addall( &cflags, dll_flags );
             if (source->use_msvcrt) strarray_addall( &cflags, msvcrt_flags );
-            if (!unix_lib_supported && make->module && is_crt_module( make->module ))
+            if (!unix_lib_supported && ((make->module && is_crt_module( make->module ))
+                    || (make->testdll && is_crt_module( make->testdll ))))
                 strarray_add( &cflags, "-fno-builtin" );
         }
         strarray_addall( &cflags, cpp_flags );
     }
     else
     {
-        if (make->module && is_crt_module( make->module )) strarray_add( &cflags, "-fno-builtin" );
+        if ((make->module && is_crt_module( make->module ))
+                || (make->testdll && is_crt_module( make->testdll )))
+            strarray_add( &cflags, "-fno-builtin" );
     }

output( "%s: %s\n", obj_dir_path( make, obj_name ), source->filename );