diff options
Diffstat (limited to 'waflib/Tools/xlcxx.py')
| -rw-r--r-- | waflib/Tools/xlcxx.py | 54 |
1 files changed, 28 insertions, 26 deletions
diff --git a/waflib/Tools/xlcxx.py b/waflib/Tools/xlcxx.py index 76aa59bc..150aeaa4 100644 --- a/waflib/Tools/xlcxx.py +++ b/waflib/Tools/xlcxx.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # encoding: utf-8 -# Thomas Nagy, 2006-2018 (ita) +# Thomas Nagy, 2006-2010 (ita) # Ralf Habacker, 2006 (rh) # Yinon Ehrlich, 2009 # Michael Kuhn, 2009 @@ -11,7 +11,7 @@ from waflib.Configure import conf @conf def find_xlcxx(conf): """ - Detects the Aix C++ compiler + Detect the Aix C++ compiler """ cxx = conf.find_program(['xlc++_r', 'xlc++'], var='CXX') conf.get_xlc_version(cxx) @@ -24,36 +24,38 @@ def xlcxx_common_flags(conf): """ v = conf.env - v.CXX_SRC_F = [] - v.CXX_TGT_F = ['-c', '-o'] + v['CXX_SRC_F'] = [] + v['CXX_TGT_F'] = ['-c', '-o'] - if not v.LINK_CXX: - v.LINK_CXX = v.CXX + # linker + if not v['LINK_CXX']: v['LINK_CXX'] = v['CXX'] + v['CXXLNK_SRC_F'] = [] + v['CXXLNK_TGT_F'] = ['-o'] + v['CPPPATH_ST'] = '-I%s' + v['DEFINES_ST'] = '-D%s' - v.CXXLNK_SRC_F = [] - v.CXXLNK_TGT_F = ['-o'] - v.CPPPATH_ST = '-I%s' - v.DEFINES_ST = '-D%s' + v['LIB_ST'] = '-l%s' # template for adding libs + v['LIBPATH_ST'] = '-L%s' # template for adding libpaths + v['STLIB_ST'] = '-l%s' + v['STLIBPATH_ST'] = '-L%s' + v['RPATH_ST'] = '-Wl,-rpath,%s' - v.LIB_ST = '-l%s' # template for adding libs - v.LIBPATH_ST = '-L%s' # template for adding libpaths - v.STLIB_ST = '-l%s' - v.STLIBPATH_ST = '-L%s' - v.RPATH_ST = '-Wl,-rpath,%s' + v['SONAME_ST'] = [] + v['SHLIB_MARKER'] = [] + v['STLIB_MARKER'] = [] - v.SONAME_ST = [] - v.SHLIB_MARKER = [] - v.STLIB_MARKER = [] + # program + v['LINKFLAGS_cxxprogram']= ['-Wl,-brtl'] + v['cxxprogram_PATTERN'] = '%s' - v.LINKFLAGS_cxxprogram= ['-Wl,-brtl'] - v.cxxprogram_PATTERN = '%s' + # shared library + v['CXXFLAGS_cxxshlib'] = ['-fPIC'] + v['LINKFLAGS_cxxshlib'] = ['-G', '-Wl,-brtl,-bexpfull'] + v['cxxshlib_PATTERN'] = 'lib%s.so' - v.CXXFLAGS_cxxshlib = ['-fPIC'] - v.LINKFLAGS_cxxshlib = ['-G', '-Wl,-brtl,-bexpfull'] - v.cxxshlib_PATTERN = 'lib%s.so' - - v.LINKFLAGS_cxxstlib = [] - v.cxxstlib_PATTERN = 'lib%s.a' + # static lib + v['LINKFLAGS_cxxstlib'] = [] + v['cxxstlib_PATTERN'] = 'lib%s.a' def configure(conf): conf.find_xlcxx() |