Changeset 988 for vendor/current/buildtools/wafsamba/irixcc.py

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/buildtools/wafsamba/irixcc.py (modified) (1 diff)

vendor/current/buildtools/wafsamba/irixcc.py

@@ -14 +14 @@
 @conftest
 def find_irixcc(conf):
-        v = conf.env
-        cc = None
-        if v['CC']: cc = v['CC']
-        elif 'CC' in conf.environ: cc = conf.environ['CC']
-        if not cc: cc = conf.find_program('cc', var='CC')
-        if not cc: conf.fatal('irixcc was not found')
-        cc = conf.cmd_to_list(cc)
+    v = conf.env
+    cc = None
+    if v['CC']: cc = v['CC']
+    elif 'CC' in conf.environ: cc = conf.environ['CC']
+    if not cc: cc = conf.find_program('cc', var='CC')
+    if not cc: conf.fatal('irixcc was not found')
+    cc = conf.cmd_to_list(cc)
 
-        try:
-                if Utils.cmd_output(cc + ['-version']) != '':
-                        conf.fatal('irixcc %r was not found' % cc)
-        except ValueError:
-                conf.fatal('irixcc -v could not be executed')
+    try:
+        if Utils.cmd_output(cc + ['-c99'] + ['-version']) != '':
+            conf.fatal('irixcc %r was not found' % cc)
+    except ValueError:
+        conf.fatal('irixcc -v could not be executed')
 
-        v['CC']  = cc
-        v['CC_NAME'] = 'irix'
+    conf.env.append_unique('CCFLAGS', '-c99')
+
+    v['CC']  = cc
+    v['CC_NAME'] = 'irix'
 
 @conftest
 def irixcc_common_flags(conf):
-        v = conf.env
+    v = conf.env
 
-        v['CC_SRC_F']            = ''
-        v['CC_TGT_F']            = ['-c', '-o', '']
-        v['CPPPATH_ST']          = '-I%s' # template for adding include paths
+    v['CC_SRC_F']            = ''
+    v['CC_TGT_F']            = ['-c', '-o', '']
+    v['CPPPATH_ST']          = '-I%s' # template for adding include paths
 
-        # linker
-        if not v['LINK_CC']: v['LINK_CC'] = v['CC']
-        v['CCLNK_SRC_F']         = ''
-        v['CCLNK_TGT_F']         = ['-o', '']
+    # linker
+    if not v['LINK_CC']: v['LINK_CC'] = v['CC']
+    v['CCLNK_SRC_F']         = ''
+    v['CCLNK_TGT_F']         = ['-o', '']
 
-        v['LIB_ST']              = '-l%s' # template for adding libs
-        v['LIBPATH_ST']          = '-L%s' # template for adding libpaths
-        v['STATICLIB_ST']        = '-l%s'
-        v['STATICLIBPATH_ST']    = '-L%s'
-        v['CCDEFINES_ST']        = '-D%s'
+    v['LIB_ST']              = '-l%s' # template for adding libs
+    v['LIBPATH_ST']          = '-L%s' # template for adding libpaths
+    v['STATICLIB_ST']        = '-l%s'
+    v['STATICLIBPATH_ST']    = '-L%s'
+    v['CCDEFINES_ST']        = '-D%s'
 
-#       v['SONAME_ST']           = '-Wl,-h -Wl,%s'
-#       v['SHLIB_MARKER']        = '-Bdynamic'
-#       v['STATICLIB_MARKER']    = '-Bstatic'
+#    v['SONAME_ST']           = '-Wl,-h -Wl,%s'
+#    v['SHLIB_MARKER']        = '-Bdynamic'
+#    v['STATICLIB_MARKER']    = '-Bstatic'
 
-        # program
-        v['program_PATTERN']     = '%s'
+    # program
+    v['program_PATTERN']     = '%s'
 
-        # shared library
-#       v['shlib_CCFLAGS']       = ['-Kpic', '-DPIC']
-#       v['shlib_LINKFLAGS']     = ['-G']
-        v['shlib_PATTERN']       = 'lib%s.so'
+    # shared library
+#    v['shlib_CCFLAGS']       = ['-Kpic', '-DPIC']
+#    v['shlib_LINKFLAGS']     = ['-G']
+    v['shlib_PATTERN']       = 'lib%s.so'
 
-        # static lib
-#       v['staticlib_LINKFLAGS'] = ['-Bstatic']
-#       v['staticlib_PATTERN']   = 'lib%s.a'
+    # static lib
+#    v['staticlib_LINKFLAGS'] = ['-Bstatic']
+#    v['staticlib_PATTERN']   = 'lib%s.a'
 
 detect = '''