diff options
-rw-r--r-- | numpy/distutils/fcompiler/absoft.py | 2 | ||||
-rw-r--r-- | numpy/distutils/fcompiler/gnu.py | 5 | ||||
-rw-r--r-- | numpy/distutils/fcompiler/intel.py | 5 | ||||
-rw-r--r-- | numpy/distutils/fcompiler/pg.py | 2 | ||||
-rw-r--r-- | numpy/distutils/fcompiler/sun.py | 2 |
5 files changed, 11 insertions, 5 deletions
diff --git a/numpy/distutils/fcompiler/absoft.py b/numpy/distutils/fcompiler/absoft.py index 2c3edfe02..d14fee0e1 100644 --- a/numpy/distutils/fcompiler/absoft.py +++ b/numpy/distutils/fcompiler/absoft.py @@ -66,7 +66,7 @@ class AbsoftFCompiler(FCompiler): def library_dir_option(self, dir): if os.name=='nt': - return ['-link', '/PATH:"%s"' % (dir)] + return ['-link', '/PATH:%s' % (dir)] return "-L" + dir def library_option(self, lib): diff --git a/numpy/distutils/fcompiler/gnu.py b/numpy/distutils/fcompiler/gnu.py index 0f7e48152..c838f11d6 100644 --- a/numpy/distutils/fcompiler/gnu.py +++ b/numpy/distutils/fcompiler/gnu.py @@ -269,8 +269,11 @@ class GnuFCompiler(FCompiler): # Linux/Solaris/Unix support RPATH, Windows and AIX do not raise NotImplementedError + # TODO: could use -Xlinker here, if it's supported + assert "," not in dir + sep = ',' if sys.platform == 'darwin' else '=' - return '-Wl,-rpath%s"%s"' % (sep, dir) + return '-Wl,-rpath%s%s' % (sep, dir) class Gnu95FCompiler(GnuFCompiler): diff --git a/numpy/distutils/fcompiler/intel.py b/numpy/distutils/fcompiler/intel.py index 217eac8fb..51f681274 100644 --- a/numpy/distutils/fcompiler/intel.py +++ b/numpy/distutils/fcompiler/intel.py @@ -23,7 +23,10 @@ class BaseIntelFCompiler(FCompiler): f + '.f', '-o', f + '.o'] def runtime_library_dir_option(self, dir): - return '-Wl,-rpath="%s"' % dir + # TODO: could use -Xlinker here, if it's supported + assert "," not in dir + + return '-Wl,-rpath=%s' % dir class IntelFCompiler(BaseIntelFCompiler): diff --git a/numpy/distutils/fcompiler/pg.py b/numpy/distutils/fcompiler/pg.py index 99071800a..bf100dfa5 100644 --- a/numpy/distutils/fcompiler/pg.py +++ b/numpy/distutils/fcompiler/pg.py @@ -57,7 +57,7 @@ class PGroupFCompiler(FCompiler): return ["-dynamic", '-undefined', 'dynamic_lookup'] def runtime_library_dir_option(self, dir): - return '-R"%s"' % dir + return '-R%s' % dir if sys.version_info >= (3, 5): diff --git a/numpy/distutils/fcompiler/sun.py b/numpy/distutils/fcompiler/sun.py index d477d3308..561ea854f 100644 --- a/numpy/distutils/fcompiler/sun.py +++ b/numpy/distutils/fcompiler/sun.py @@ -44,7 +44,7 @@ class SunFCompiler(FCompiler): return opt def runtime_library_dir_option(self, dir): - return '-R"%s"' % dir + return '-R%s' % dir if __name__ == '__main__': from distutils import log |