diff options
| author | Brad King <brad.king@kitware.com> | 2019-01-25 12:50:16 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-01-25 12:50:23 (GMT) |
| commit | 29fbd3c9a0ab2a27e9deadccd160d15e5e80e70e (patch) | |
| tree | 2093e24fc52849c5a9f33efeca4b49a404636f60 | |
| parent | 0d8d7a6896c5065c4baa1c4f5489e2424535ce6a (diff) | |
| parent | 8f56f22b84b52238dca066cc431c6e82f5380fe4 (diff) | |
| download | CMake-29fbd3c9a0ab2a27e9deadccd160d15e5e80e70e.zip CMake-29fbd3c9a0ab2a27e9deadccd160d15e5e80e70e.tar.gz CMake-29fbd3c9a0ab2a27e9deadccd160d15e5e80e70e.tar.bz2 | |
Merge topic 'aarch64-no-std-move-function'
8f56f22b84 cmListCommand: Avoid std::function move constructor on aarch64
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2857
| -rw-r--r-- | Source/cmListCommand.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/cmListCommand.cxx b/Source/cmListCommand.cxx index 05b22cf..b24c5ba 100644 --- a/Source/cmListCommand.cxx +++ b/Source/cmListCommand.cxx @@ -666,7 +666,12 @@ bool cmListCommand::HandleTransformCommand( ActionDescriptor(std::string name, int arity, transform_type transform) : Name(std::move(name)) , Arity(arity) +#if defined(__GNUC__) && __GNUC__ == 6 && defined(__aarch64__) + // std::function move constructor miscompiles on this architecture + , Transform(transform) +#else , Transform(std::move(transform)) +#endif { } |