Fix building PE test executables in environments where $CFLAGS is needed.

	* ld-pe/pe-run2.exp (test_direct2_link_dll): Add $CFLAGS to the
	compiler command line.

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 1da78f33b1aa82a24d81d232bb209cc224d1bbea..483baa780658d22627a4a8b321d315a107117e23 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-05-29  Stephen Kitt  <steve@sk2.org>
+
+       * ld-pe/pe-run2.exp (test_direct2_link_dll): Add $CFLAGS to the
+       compiler command line.
+
 2015-05-28  Catherine Moore  <clm@codesourcery.com>
 
        ld/testsuite/

diff --git a/ld/testsuite/ld-pe/pe-run2.exp b/ld/testsuite/ld-pe/pe-run2.exp
index 43f9f5da38757a39a4cb7c42e27d2426747bba69..e010dd0085d9ac8ccb295616efc907291cc83bbc 100644 (file)
--- a/ld/testsuite/ld-pe/pe-run2.exp
+++ b/ld/testsuite/ld-pe/pe-run2.exp
@@ -84,7 +84,7 @@ proc test_direct2_link_dll {} {
        } else {
            # Check linking directly to direct2_dll.dll.
            set msg "linking client (.dll) fastcall/stdcall"
-           if [ld_simple_link "$CC -Wl,--enable-stdcall-fixup -Wl,--enable-auto-import" $tmpdir/direct2_client_dll.exe \
+           if [ld_simple_link "$CC $CFLAGS -Wl,--enable-stdcall-fixup -Wl,--enable-auto-import" $tmpdir/direct2_client_dll.exe \
              "$tmpdir/direct2_client.o $tmpdir/direct2_dll.dll" ] {
                pass $msg
            } else {
@@ -93,7 +93,7 @@ proc test_direct2_link_dll {} {
 
            # Check linking directly to direct2_dll.sl.
            set msg "linking client (.sl) fastcall/stdcall"
-           if [ld_simple_link "$CC -Wl,--enable-stdcall-fixup -Wl,--enable-auto-import" $tmpdir/direct2_client_sl.exe \
+           if [ld_simple_link "$CC $CFLAGS -Wl,--enable-stdcall-fixup -Wl,--enable-auto-import" $tmpdir/direct2_client_sl.exe \
              "$tmpdir/direct2_client.o $tmpdir/direct2_dll.sl" ] {
                pass $msg
            } else {
@@ -104,7 +104,7 @@ proc test_direct2_link_dll {} {
            # Create symbolic link.
            catch "exec ln -fs direct2_dll.dll $tmpdir/libdirect2_dll.dll.a" ln_catch
            set msg "linking client (symlink -> .dll) fastcall/stdcall"
-           if [ld_simple_link "$CC -Wl,--enable-stdcall-fixup -Wl,--enable-auto-import" $tmpdir/direct2_client_symlink_dll.exe \
+           if [ld_simple_link "$CC $CFLAGS -Wl,--enable-stdcall-fixup -Wl,--enable-auto-import" $tmpdir/direct2_client_symlink_dll.exe \
              "$tmpdir/direct2_client.o $tmpdir/libdirect2_dll.dll.a" ] {
                pass $msg
            } else {
@@ -115,7 +115,7 @@ proc test_direct2_link_dll {} {
            # Create symbolic link.
            catch "exec ln -fs direct2_dll.sl $tmpdir/libdirect2_sl.dll.a" ln_catch
            set msg "linking client (symlink -> .sl) fastcall/stdcall"
-           if [ld_simple_link "$CC -Wl,--enable-stdcall-fixup -Wl,--enable-auto-import" $tmpdir/direct2_client_symlink_sl.exe \
+           if [ld_simple_link "$CC $CFLAGS -Wl,--enable-stdcall-fixup -Wl,--enable-auto-import" $tmpdir/direct2_client_symlink_sl.exe \
              "$tmpdir/direct2_client.o $tmpdir/libdirect2_sl.dll.a" ] {
                pass $msg
            } else {