diff options
| author | Andreas Schneider <asn@samba.org> | 2021-08-25 15:34:58 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2021-09-02 21:22:17 +0000 |
| commit | 59ed09928541d40df72592419247add608a54aca (patch) | |
| tree | 85a8bd7ec2200f3b498897a2c7d376bbc874b659 /third_party/waf/waflib/Build.py | |
| parent | e41bc0f43f6d86d554f37881263c43c356994726 (diff) | |
| download | samba-59ed09928541d40df72592419247add608a54aca.tar.gz | |
third_party: Update waf to version 2.0.22
New in waf 2.0.22
* Fix stdin propagation with faulty vcvarsall scripts #2315
* Enable mixing Unix-style paths with destdir on Windows platforms #2337
* Fix shell escaping unit test parameters #2314
* Improve extras/clang_compilation_database and extras/swig compatibility #2336
* Propagate C++ flags to the Cuda compiler in extras/cuda #2311
* Fix detection of Qt 5.0.0 (preparation for Qt6) #2331
* Enable Haxe processing #2308
* Fix regression in MACOSX_DEPLOYMENT_TARGET caused by distutils #2330
* Fix extras/wafcache concurrent trimming issues #2312
* Fix extras/wafcache symlink handling #2327
The import was done like this:
./third_party/waf/update.sh
Then changing buildtools/bin/waf and buildtools/wafsamba/wafsamba.py
by hand.
Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Thu Sep 2 21:22:17 UTC 2021 on sn-devel-184
Diffstat (limited to 'third_party/waf/waflib/Build.py')
| -rw-r--r-- | third_party/waf/waflib/Build.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/third_party/waf/waflib/Build.py b/third_party/waf/waflib/Build.py index 52837618577..b49dd8302b1 100644 --- a/third_party/waf/waflib/Build.py +++ b/third_party/waf/waflib/Build.py @@ -1066,9 +1066,9 @@ class inst(Task.Task): else: dest = os.path.normpath(Utils.subst_vars(self.install_to, self.env)) if not os.path.isabs(dest): - dest = os.path.join(self.env.PREFIX, dest) + dest = os.path.join(self.env.PREFIX, dest) if destdir and Options.options.destdir: - dest = os.path.join(Options.options.destdir, os.path.splitdrive(dest)[1].lstrip(os.sep)) + dest = Options.options.destdir.rstrip(os.sep) + os.sep + os.path.splitdrive(dest)[1].lstrip(os.sep) return dest def copy_fun(self, src, tgt): |