[pypy-svn] r33806 - in pypy/dist/pypy/translator: . c

[cfbolz at codespeak.net]

Author: cfbolz
Date: Fri Oct 27 13:03:29 2006
New Revision: 33806

Modified:
   pypy/dist/pypy/translator/c/genc.py
   pypy/dist/pypy/translator/translator.py
Log:
remove last occurences of driver_options


Modified: pypy/dist/pypy/translator/c/genc.py
==============================================================================
--- pypy/dist/pypy/translator/c/genc.py	(original)
+++ pypy/dist/pypy/translator/c/genc.py	Fri Oct 27 13:03:29 2006
@@ -222,14 +222,8 @@
         # XXX for now, we always include Python.h
         from distutils import sysconfig
         python_inc = sysconfig.get_python_inc()
-        if self.translator.driver_options:
-            cc = self.translator.driver_options.cc
-        else:
-            cc = None
-        if self.translator.driver_options:
-            profopt = self.translator.driver_options.profopt
-        else:
-            profopt = None
+        cc = self.config.translation.cc
+        profopt = self.config.translation.profopt
         return CCompiler(
             [self.c_source_filename] + self.extrafiles,
             include_dirs = [autopath.this_dir, python_inc] + extra_includes,
@@ -268,13 +262,13 @@
             cfiles.append(fn)
             ofiles.append(fn[:-2] + '.o')
 
-        if self.translator.driver_options and self.translator.driver_options.cc:
-            cc = self.translator.driver_options.cc
+        if self.config.translation.cc:
+            cc = self.config.translation.cc
         else:
             cc = 'gcc'
 
-        if self.translator.driver_options and self.translator.driver_options.profopt:
-            profopt = self.translator.driver_options.profopt
+        if self.config.translation.profopt:
+            profopt = self.config.translation.profopt
         else:
             profopt = ''
 

Modified: pypy/dist/pypy/translator/translator.py
==============================================================================
--- pypy/dist/pypy/translator/translator.py	(original)
+++ pypy/dist/pypy/translator/translator.py	Fri Oct 27 13:03:29 2006
@@ -44,7 +44,6 @@
         self._prebuilt_graphs = {}   # only used by the pygame viewer
 
         self._implicitly_called_by_externals = []
-        self.driver_options = None
 
     def buildflowgraph(self, func):
         """Get the flow graph for a function."""