diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-11-26 12:59:42 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-26 12:59:42 -0500 |
commit | a32716f9fead988df150037b262ccceb24d8dc9e (patch) | |
tree | a9f3e6e674bb05cac9ae5579a1270cec9373900a /mesonbuild/backend | |
parent | 8652b94c4f87e8582e2e757178dda452a2c0e3be (diff) | |
parent | 864b9b1957bef39b9437b1a73c014e43607b7759 (diff) | |
download | meson-a32716f9fead988df150037b262ccceb24d8dc9e.zip meson-a32716f9fead988df150037b262ccceb24d8dc9e.tar.gz meson-a32716f9fead988df150037b262ccceb24d8dc9e.tar.bz2 |
Merge pull request #1098 from centricular/unity-extract-objects-regression
Only check for unity compat when doing unity builds
Diffstat (limited to 'mesonbuild/backend')
-rw-r--r-- | mesonbuild/backend/backends.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index c37ae2a..49b6008 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -279,13 +279,9 @@ class Backend(): result = [] targetdir = self.get_target_private_dir(extobj.target) # With unity builds, there's just one object that contains all the - # sources, so if we want all the objects, just return that. + # sources, and we only support extracting all the objects in this mode, + # so just return that. if self.environment.coredata.get_builtin_option('unity'): - if not extobj.unity_compatible: - # This should never happen - msg = 'BUG: Meson must not allow extracting single objects ' \ - 'in Unity builds' - raise AssertionError(msg) comp = get_compiler_for_source(extobj.target.compilers.values(), extobj.srclist[0]) # The unity object name uses the full absolute path of the source file |