4 files changed, 150 insertions, 1 deletions
diff --git a/buildtools/wafsamba/generic_cc.py b/buildtools/wafsamba/generic_cc.py
new file mode 100644
index 0000000000..ae37219f12
--- /dev/null
+++ b/buildtools/wafsamba/generic_cc.py
@@ -0,0 +1,70 @@
+
+# compiler definition for a generic C compiler
+# based on suncc.py from waf
+
+import os, optparse
+import Utils, Options, Configure
+import ccroot, ar
+from Configure import conftest
+
+from compiler_cc import c_compiler
+
+c_compiler['default'] = ['gcc', 'generic_cc']
+
+@conftest
+def find_generic_cc(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('generic_cc was not found')
+	cc = conf.cmd_to_list(cc)
+	v['CC']  = cc
+	v['CC_NAME'] = 'generic'
+
+@conftest
+def generic_cc_common_flags(conf):
+	v = conf.env
+
+	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', '']
+
+	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'
+
+	# program
+	v['program_PATTERN']     = '%s'
+
+	# 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'
+
+detect = '''
+find_generic_cc
+find_cpp
+find_ar
+generic_cc_common_flags
+cc_load_tools
+cc_add_flags
+link_add_flags
+'''
+
diff --git a/buildtools/wafsamba/irixcc.py b/buildtools/wafsamba/irixcc.py
new file mode 100644
index 0000000000..1461bf8c83
--- /dev/null
+++ b/buildtools/wafsamba/irixcc.py
@@ -0,0 +1,77 @@
+
+# compiler definition for irix/MIPSpro cc compiler
+# based on suncc.py from waf
+
+import os, optparse
+import Utils, Options, Configure
+import ccroot, ar
+from Configure import conftest
+
+from compiler_cc import c_compiler
+
+c_compiler['irix'] = ['gcc', 'irixcc']
+
+@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)
+
+	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')
+
+	v['CC']  = cc
+	v['CC_NAME'] = 'irix'
+
+@conftest
+def irixcc_common_flags(conf):
+	v = conf.env
+
+	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', '']
+
+	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'
+
+	# program
+	v['program_PATTERN']     = '%s'
+
+	# 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'
+
+detect = '''
+find_irixcc
+find_cpp
+find_ar
+irixcc_common_flags
+cc_load_tools
+cc_add_flags
+link_add_flags
+'''
+
diff --git a/buildtools/wafsamba/tru64cc.py b/buildtools/wafsamba/tru64cc.py
index 04f26ec45a..c4a0dcaf5a 100644
--- a/buildtools/wafsamba/tru64cc.py
+++ b/buildtools/wafsamba/tru64cc.py
@@ -9,7 +9,7 @@ from Configure import conftest
 
 from compiler_cc import c_compiler
 
-c_compiler['osf1V'] = ['tru64cc']
+c_compiler['osf1V'] = ['gcc', 'tru64cc']
 
 @conftest
 def find_tru64cc(conf):
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 510b27062c..7a71a2ee2f 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -21,6 +21,8 @@ from samba_bundled import *
 import samba_install
 import samba_conftests
 import tru64cc
+import irixcc
+import generic_cc
 
 # some systems have broken threading in python
 if os.environ.get('WAF_NOTHREADS') == '1':