undo this

git-svn-id: https://waf.googlecode.com/svn/trunk@10912 f0382ac9-c320-0410-b3f0-b508d59f5a85

diff --git a/waflib/Tools/xlc.py b/waflib/Tools/xlc.py
index df831329fe04eeb130cbdef902af4d07950a99c0..b88256a7f0a40b4c851556ae8f445477e65c17be 100644 (file)
--- a/waflib/Tools/xlc.py
+++ b/waflib/Tools/xlc.py
@@ -14,17 +14,17 @@ def find_xlc(conf):
        """
        Detect the Aix C compiler
        """
-       cc = conf.find_program(['xlc_r', 'xlc', 'bgxlc_r','bgxlc'], var='CC')
+       cc = conf.find_program(['xlc_r', 'xlc'], var='CC')
        cc = conf.cmd_to_list(cc)
-       conf.env.CC      = cc
        conf.env.CC_NAME = 'xlc'
+       conf.env.CC      = cc
 
 @conf
-def xlc_common_flags(self):
+def xlc_common_flags(conf):
        """
        Flags required for executing the Aix C compiler
        """
-       v = self.env
+       v = conf.env
 
        v['CC_SRC_F']            = []
        v['CC_TGT_F']            = ['-c', '-o']
@@ -59,16 +59,11 @@ def xlc_common_flags(self):
        v['LINKFLAGS_cstlib']    = []
        v['cstlib_PATTERN']      = 'lib%s.a'
 
-@conf
-def xlc_on_bg(self):
-       if 'bgxlc' in self.env.CC:
-               v['LINKFLAGS_cshlib']= ['-G', '-Wl,-bexpfull']
-
-def configure(self):
-       self.find_xlc()
-       self.find_ar()
-       self.xlc_common_flags()
-       self.cc_load_tools()
-       self.cc_add_flags()
-       self.link_add_flags()
+def configure(conf):
+       conf.find_xlc()
+       conf.find_ar()
+       conf.xlc_common_flags()
+       conf.cc_load_tools()
+       conf.cc_add_flags()
+       conf.link_add_flags()