Skip to content
Snippets Groups Projects

postpone LIBPATH setting as other tools might modify environment

Merged Dominic Klinger requested to merge PostponeLibpathSetting into master
1 file
+ 1
2
Compare changes
  • Side-by-side
  • Inline
@@ -135,6 +135,7 @@ def verifyBaseoutDirWritable(baseoutdir):
def prePackageCollection(env, **kw):
sconstruct_dir = kw.get('sconstruct_dir', Dir('#'))
env.AppendUnique(LIBPATH=[getLibraryInstallDir(env)])
env.AppendUnique(EXCLUDE_DIRS_REL=[env['BUILDDIR']])
if env.getBaseOutDir() == sconstruct_dir:
env.AppendUnique(EXCLUDE_DIRS_TOPLEVEL=[
@@ -201,8 +202,6 @@ def generate(env):
env.AddMethod(getLogInstallDir, 'getLogInstallDir')
env.AddMethod(makeInstallablePathFromDir, 'makeInstallablePathFromDir')
env.AppendUnique(LIBPATH=[getLibraryInstallDir(env)])
Callback().register('PrePackageCollection', prePackageCollection)
Loading