Don't use SAGE_CYTHONIZED in sage_include_directories()

sagemath · Aug 30, 2017 · 33746a2 · 33746a2
1 parent 037272c
commit 33746a2
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 9 deletions.
diff --git a/src/sage/env.py b/src/sage/env.py
@@ -236,8 +236,6 @@ def sage_include_directories(use_sources=False):
     if use_sources :
         include_directories.extend([SAGE_SRC,
                                     opj(SAGE_SRC, 'sage', 'ext')])
-        include_directories.extend([SAGE_CYTHONIZED,
-                                    opj(SAGE_CYTHONIZED, 'sage', 'ext')])
     else:
         include_directories.extend([SAGE_LIB,
                                     opj(SAGE_LIB, 'sage', 'ext')])

diff --git a/src/sage_setup/autogen/interpreters/specs/cc.py b/src/sage_setup/autogen/interpreters/specs/cc.py
@@ -145,7 +145,7 @@ def __init__(self):
             sage: print(interp.c_header)
             <BLANKLINE>
             #include <mpc.h>
-            #include "interpreters/wrapper_cc.h"
+            #include "sage/ext/interpreters/wrapper_cc.h"
             <BLANKLINE>
 
         So instructions where you need to interact with Python can
@@ -167,7 +167,7 @@ def __init__(self):
         self.c_header = ri(0,
             '''
             #include <mpc.h>
-            #include "interpreters/wrapper_cc.h"
+            #include "sage/ext/interpreters/wrapper_cc.h"
             ''')
 
         self.pxd_header = ri(0,

diff --git a/src/sage_setup/autogen/interpreters/specs/cdf.py b/src/sage_setup/autogen/interpreters/specs/cdf.py
@@ -84,7 +84,7 @@ def __init__(self):
         self.c_header = ri(0,"""
             #include <stdlib.h>
             #include <complex.h>
-            #include "interpreters/wrapper_cdf.h"
+            #include "sage/ext/interpreters/wrapper_cdf.h"
 
             /* On Solaris, we need to define _Imaginary_I when compiling with GCC,
              * otherwise the constant I doesn't work. The definition below is based

diff --git a/src/sage_setup/autogen/interpreters/specs/element.py b/src/sage_setup/autogen/interpreters/specs/element.py
@@ -103,7 +103,7 @@ def __init__(self):
         self.chunks = [self.mc_args, self.mc_constants, self.mc_stack,
                        self.mc_domain_info, self.mc_code]
         self.c_header = ri(0, """
-            #include "interpreters/wrapper_el.h"
+            #include "sage/ext/interpreters/wrapper_el.h"
 
             #define CHECK(x) do_check(&(x), domain)
 

diff --git a/src/sage_setup/autogen/interpreters/specs/rr.py b/src/sage_setup/autogen/interpreters/specs/rr.py
@@ -145,7 +145,7 @@ def __init__(self):
             sage: print(interp.c_header)
             <BLANKLINE>
             #include <mpfr.h>
-            #include "interpreters/wrapper_rr.h"
+            #include "sage/ext/interpreters/wrapper_rr.h"
             <BLANKLINE>
 
         The function ``rr_py_call_helper`` is implemented in Cython::
@@ -187,7 +187,7 @@ def __init__(self):
         self.c_header = ri(0,
             '''
             #include <mpfr.h>
-            #include "interpreters/wrapper_rr.h"
+            #include "sage/ext/interpreters/wrapper_rr.h"
             ''')
 
         self.pxd_header = ri(0,

diff --git a/src/setup.py b/src/setup.py
@@ -87,8 +87,8 @@ def excepthook(*exc):
     keep_going = False
 
 # search for dependencies and add to gcc -I<path>
-# this depends on SAGE_CYTHONIZED
 include_dirs = sage_include_directories(use_sources=True)
+include_dirs.append(SAGE_CYTHONIZED)
 
 # Look for libraries in $SAGE_LOCAL/lib
 library_dirs = [os.path.join(SAGE_LOCAL, "lib")]