2011-09-08 Jeff Johnston <jjohnstn@redhat.com>

        * testsuite/lib/flags.exp: Add logic to add the
        srcdir include directory to compile flags.

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index cdda0cf043d3745f3bbf5b070075a8d3be0675e0..4e4c1afa0ed602aa29b8bf0a19b00e59e77a3994 100644 (file)
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-08  Jeff Johnston  <jjohnstn@redhat.com>
+
+       * testsuite/lib/flags.exp: Add logic to add the
+       srcdir include directory to compile flags.
+
 2011-08-26  Steven Abner  <pheonix@zoomtown.com>
 
        * libc/time/mktm_r.c (_mktm_r): Fix previous fix.

diff --git a/newlib/testsuite/lib/flags.exp b/newlib/testsuite/lib/flags.exp
index cc9a3561e986bbbdd7e69517d69a6fc84e691aca..577efa86760b782ff842f8dc5800358506927182 100644 (file)
--- a/newlib/testsuite/lib/flags.exp
+++ b/newlib/testsuite/lib/flags.exp
@@ -1,4 +1,4 @@
-# Copyright (C) 2002 by Red Hat, Incorporated. All rights reserved.
+# Copyright (C) 2002, 2011 by Red Hat, Incorporated. All rights reserved.
 #
 # Permission to use, copy, modify, and distribute this software
 # is freely granted, provided that this notice is preserved.
@@ -82,5 +82,9 @@ proc newlib_include_flags { args } {
        return ""
     }
 
-    return " -I$objdir/targ-include"
+    set newlib_dir [lookfor_file ${srcdir} newlib/libc/include/assert.h]
+    if { ${newlib_dir} != "" } {
+        set newlib_dir [file dirname ${newlib_dir}]
+    }
+    return " -I$objdir/targ-include -I$objdir -I${newlib_dir}"
 }