Rpath trimming.

pull/15/head
Jussi Pakkanen 11 years ago
parent fff79b0810
commit d1dfb5f512
  1. 11
      environment.py

@ -158,6 +158,7 @@ class CCompiler():
def has_header(self, hname): def has_header(self, hname):
templ = '''#include<%s> templ = '''#include<%s>
int someSymbolHereJustForFun;
''' '''
return self.compiles(templ % hname) return self.compiles(templ % hname)
@ -532,6 +533,8 @@ class GnuCCompiler(CCompiler):
return (os.path.split(fname)[0], fname) return (os.path.split(fname)[0], fname)
def build_rpath_args(self, build_dir, rpath_paths): def build_rpath_args(self, build_dir, rpath_paths):
if len(rpath_paths) == 0:
return []
return ['-Wl,-rpath,' + ':'.join([os.path.join(build_dir, p) for p in rpath_paths])] return ['-Wl,-rpath,' + ':'.join([os.path.join(build_dir, p) for p in rpath_paths])]
def get_soname_flags(self, shlib_name, path): def get_soname_flags(self, shlib_name, path):
@ -555,6 +558,8 @@ class GnuObjCCompiler(ObjCCompiler):
return 'gch' return 'gch'
def build_rpath_args(self, build_dir, rpath_paths): def build_rpath_args(self, build_dir, rpath_paths):
if len(rpath_paths) == 0:
return []
return ['-Wl,-rpath,' + ':'.join([os.path.join(build_dir, p) for p in rpath_paths])] return ['-Wl,-rpath,' + ':'.join([os.path.join(build_dir, p) for p in rpath_paths])]
def get_soname_flags(self, shlib_name, path): def get_soname_flags(self, shlib_name, path):
@ -578,6 +583,8 @@ class GnuObjCPPCompiler(ObjCPPCompiler):
return 'gch' return 'gch'
def build_rpath_args(self, build_dir, rpath_paths): def build_rpath_args(self, build_dir, rpath_paths):
if len(rpath_paths) == 0:
return []
return ['-Wl,-rpath,' + ':'.join([os.path.join(build_dir, p) for p in rpath_paths])] return ['-Wl,-rpath,' + ':'.join([os.path.join(build_dir, p) for p in rpath_paths])]
def get_soname_flags(self, shlib_name, path): def get_soname_flags(self, shlib_name, path):
@ -601,6 +608,8 @@ class ClangCCompiler(CCompiler):
return 'pch' return 'pch'
def build_rpath_args(self, build_dir, rpath_paths): def build_rpath_args(self, build_dir, rpath_paths):
if len(rpath_paths) == 0:
return []
return ['-Wl,-rpath,' + ':'.join([os.path.join(build_dir, p) for p in rpath_paths])] return ['-Wl,-rpath,' + ':'.join([os.path.join(build_dir, p) for p in rpath_paths])]
class GnuCPPCompiler(CPPCompiler): class GnuCPPCompiler(CPPCompiler):
@ -629,6 +638,8 @@ class GnuCPPCompiler(CPPCompiler):
return 'gch' return 'gch'
def build_rpath_args(self, build_dir, rpath_paths): def build_rpath_args(self, build_dir, rpath_paths):
if len(rpath_paths) == 0:
return []
return ['-Wl,-rpath,' + ':'.join([os.path.join(build_dir, p) for p in rpath_paths])] return ['-Wl,-rpath,' + ':'.join([os.path.join(build_dir, p) for p in rpath_paths])]
def get_soname_flags(self, shlib_name, path): def get_soname_flags(self, shlib_name, path):

Loading…
Cancel
Save