Merge pull request #4265 from mangwang/master

Repair the -rpath linker option in Windows System
Theano · Mar 21, 2016 · 16e251d · 16e251d
2 parents 260fc9a + 247a987
commit 16e251d
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/theano/sandbox/cuda/nvcc_compiler.py b/theano/sandbox/cuda/nvcc_compiler.py
@@ -260,8 +260,10 @@ def compile_str(
         preargs2 = []
         for pa in preargs:
             if pa.startswith('-Wl,'):
-                preargs1.append('-Xlinker')
-                preargs1.append(pa[4:])
+                # the -rpath option is not understood by the Microsoft linker
+                if sys.platform != 'win32' or not pa.startswith('-Wl,-rpath'):
+                    preargs1.append('-Xlinker')
+                    preargs1.append(pa[4:])
                 continue
             for pattern in ['-O', '-arch=', '-ccbin=', '-G', '-g', '-I',
                             '-L', '--fmad', '--ftz', '--maxrregcount',