summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2018-12-05 20:31:41 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2018-12-05 20:31:41 (GMT)
commitee5245608cbbd89f917e72d31201adf8e11da180 (patch)
tree284f2b9ccaeae820f3f5dbf7ae6e259e7ba2c0eb /src/engine/SCons
parent839d7cc63aac9d6f7c03b4dd0c64829f7c75f1f2 (diff)
parentb12d5aa0d3f2fbef3d9ae741ddf9867d38df24b1 (diff)
downloadSCons-ee5245608cbbd89f917e72d31201adf8e11da180.zip
SCons-ee5245608cbbd89f917e72d31201adf8e11da180.tar.gz
SCons-ee5245608cbbd89f917e72d31201adf8e11da180.tar.bz2
Merge remote-tracking branch 'upstream/master' into fix_mac_shlibversion_gh_issue_3241
Diffstat (limited to 'src/engine/SCons')
-rw-r--r--src/engine/SCons/Script/__init__.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/engine/SCons/Script/__init__.py b/src/engine/SCons/Script/__init__.py
index d602507..007eb0d 100644
--- a/src/engine/SCons/Script/__init__.py
+++ b/src/engine/SCons/Script/__init__.py
@@ -377,7 +377,9 @@ GlobalDefaultBuilders = [
'SharedObject',
'StaticLibrary',
'StaticObject',
+ 'Substfile',
'Tar',
+ 'Textfile',
'TypeLibrary',
'Zip',
'Package',