Commits

Jed Brown  committed 0c399b0 Merge

Merge branch 'jed/checklink-cxx'

* jed/checklink-cxx:
checkLink: bug fix for C++ support with python-2.4

  • Participants
  • Parent commits b887097, c5f17c9

Comments (0)

Files changed (1)

File config/BuildSystem/config/libraries.py

         self.setCompilers.LIBS = ' '+self.toString(otherLibs) +' '+ self.setCompilers.LIBS
       elif libName:
         self.setCompilers.LIBS = ' '+self.toString(libName) +' '+ self.setCompilers.LIBS
-      linklang = 'Cxx' if cxxLink else self.language[-1]
+      if cxxLink: linklang = 'Cxx'
+      else: linklang = self.language[-1]
       self.pushLanguage(self.language[-1])
       found = 0
       if self.checkLink(includes, body, linkLanguage=linklang):