Skip to content

Commit 7ed47a8

Browse files
committed
Print more info about path search, and drop incomplete rpath attempt in setup.py
hg hash: f1a97291426001c32415a582fb723e6a5d553cbb
1 parent 1286db1 commit 7ed47a8

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

setup.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,20 +70,26 @@ def get_prefix(name):
7070
print(" If %s isn't in your LD_LIBRARY_PATH, compilation will likely fail." %name)
7171

7272
def get_include(name):
73+
print("Looking for %s include path" %name)
7374
env_var = "%s_INCLUDE_PATH" % name.upper()
7475
path = check_env_var(env_var)
7576
if path:
7677
return path
78+
print(" Cannot find env var %s" %env_var)
7779
prefix = get_prefix(name)
78-
return os.path.join(prefix, 'include')
80+
if prefix:
81+
return os.path.join(prefix, 'include')
7982

8083
def get_lib(name):
84+
print("Looking for %s library path" %name)
8185
env_var = "%s_LIBRARY_PATH" % name.upper()
8286
path = check_env_var(env_var)
8387
if path:
8488
return path
89+
print(" Cannot find env var %s" %env_var)
8590
prefix = get_prefix(name)
86-
return os.path.join(prefix, 'lib')
91+
if prefix:
92+
return os.path.join(prefix, 'lib')
8793

8894
# C-dependency paths for extension compilation and linking
8995
include_dirs = ['dedalus/libraries/fftw/',
@@ -126,10 +132,6 @@ def get_lib(name):
126132
print("CC not set; defaulting to gcc linker flags")
127133
extra_link_args = gcc_extra_link_args
128134

129-
# Provide rpath for mac linker
130-
if sys.platform == "darwin":
131-
extra_link_args.append('-Wl,-rpath,'+library_dirs[0])
132-
133135
# Extension objects for cython
134136
extensions = [
135137
Extension(

0 commit comments

Comments
 (0)