[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-980-g1b48834

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  1b4883412b9a507fc969b9ea3f8f01c54a6eafeb (commit)
       via  1c5be1f367abcc97ed4fe4f0a0235c147e6868a4 (commit)
      from  dd92144a268d54a790e4c5fb609d85a2e21c1f4d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1b4883412b9a507fc969b9ea3f8f01c54a6eafeb
commit 1b4883412b9a507fc969b9ea3f8f01c54a6eafeb
Merge: dd92144 1c5be1f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Dec 1 13:50:33 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Dec 1 13:50:33 2014 -0500

    Merge topic 'link-no-empty-response-files' into next
    
    1c5be1f3 Makefile: Do not create an empty linker response file


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c5be1f367abcc97ed4fe4f0a0235c147e6868a4
commit 1c5be1f367abcc97ed4fe4f0a0235c147e6868a4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Dec 1 13:43:01 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Dec 1 13:49:26 2014 -0500

    Makefile: Do not create an empty linker response file
    
    Since commit v3.1.0-rc1~821^2 (Windows: Use response files to specify
    link libraries for GNU tools, 2014-03-04) we use a response file to pass
    possibly long linker flag lists to the GNU linker on Windows.  On MinGW,
    this may cause gfortran to use a response file to pass some flags to its
    own internal invocation.  This is okay except when we are parsing
    implicit link flags from the compiler ABI detection build.  If gfortran
    uses a response file in that case then we may miss extracting some of
    the implicit link flags, such as -lgfortran.  Fortunately, in the
    compiler ABI detection case we do not actually link to anything so the
    response file is empty.  Work around this problem by simply not using a
    response file when the list of flags it is used to pass is empty (or
    just whitespace).
    
    Reported-by: Bill Somerville <bill at classdesign.com>

diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 1f8f686..85e371d 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -1846,7 +1846,7 @@ cmMakefileTargetGenerator
                           useWatcomQuote);
   linkLibs = frameworkPath + linkPath + linkLibs;
 
-  if(useResponseFile)
+  if(useResponseFile && linkLibs.find_first_not_of(" ") != linkLibs.npos)
     {
     // Lookup the response file reference flag.
     std::string responseFlagVar = "CMAKE_";

-----------------------------------------------------------------------

Summary of changes:
 Source/cmMakefileTargetGenerator.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake