diff options
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -538,7 +538,7 @@ else: # chrpath to edit this out of RPATH. env.Prepend(RPATH=[os.path.realpath(os.curdir)]) else: - print "chrpath is not available; please build with chrpath=no." + print "chrpath is not available; forcing static linking." confdefs = ["/* gpsd_config.h. Generated by scons, do not hand-hack. */\n"] @@ -555,7 +555,7 @@ else: # define a helper function for pkg-config - we need to pass # --static for static linking, too. - if env["shared"]: + if env["shared"] and env['chrpath']: pkg_config = lambda pkg: ['!%s --cflags --libs %s' %(env['PKG_CONFIG'], pkg, )] else: pkg_config = lambda pkg: ['!%s --cflags --libs --static %s' %(env['PKG_CONFIG'], pkg, )] @@ -993,7 +993,7 @@ def VersionedSharedLibraryInstall(env, destination, libs): env.Clean(lib, linkname) return ilibs -if not env["shared"]: +if not (env["shared"] and env['chrpath']): def Library(env, target, sources, version, parse_flags=[]): return env.StaticLibrary(target, sources, parse_flags=parse_flags) LibraryInstall = lambda env, libdir, sources: env.Install(libdir, sources) |