[Cmake-commits] [cmake-commits] hoffman committed cmLocalGenerator.cxx 1.311 1.312

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv21917/Source

Modified Files:
	cmLocalGenerator.cxx 
Log Message:
Add detection of gcc versions that do not support isysroot option and do not use it for them.


Index: cmLocalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.cxx,v
retrieving revision 1.311
retrieving revision 1.312
diff -C 2 -d -r1.311 -r1.312
*** cmLocalGenerator.cxx	17 Sep 2009 20:09:52 -0000	1.311
--- cmLocalGenerator.cxx	18 Sep 2009 18:22:20 -0000	1.312
***************
*** 1760,1766 ****
      const char* deploymentTarget = 
        this->Makefile->GetDefinition("CMAKE_OSX_DEPLOYMENT_TARGET");
! 
      bool flagsUsed = false;
- 
      if(osxArch && sysroot && lang && (lang[0] =='C' || lang[0] == 'F'))
        {
--- 1760,1771 ----
      const char* deploymentTarget = 
        this->Makefile->GetDefinition("CMAKE_OSX_DEPLOYMENT_TARGET");
!     const char* gccHasIsysroot = 
!       this->Makefile->GetRequiredDefinition("CMAKE_OSX_GCC_SUPPORT_ISYSROOT");
!     bool hasIsysroot = true;
!     if(cmSystemTools::IsOff(gccHasIsysroot))
!       {
!       hasIsysroot = false;
!       }
      bool flagsUsed = false;
      if(osxArch && sysroot && lang && (lang[0] =='C' || lang[0] == 'F'))
        {
***************
*** 1788,1795 ****
            flags += *i;
            }
! 
!         flags += " -isysroot ";
!         flags += sysroot;
! 
          flagsUsed = true;
          }
--- 1793,1801 ----
            flags += *i;
            }
!         if(hasIsysroot)
!           {
!           flags += " -isysroot ";
!           flags += sysroot;
!           }
          flagsUsed = true;
          }
***************
*** 1797,1801 ****
  
      if(!flagsUsed && sysroot && sysrootDefault &&
!        strcmp(sysroot, sysrootDefault) != 0)
        {
        flags += " -isysroot ";
--- 1803,1807 ----
  
      if(!flagsUsed && sysroot && sysrootDefault &&
!        strcmp(sysroot, sysrootDefault) != 0 && hasIsysroot)
        {
        flags += " -isysroot ";