diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-23 17:57:58 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-23 17:57:58 +0200 |
commit | a62a675fd22d8d34d2cdec7dff4d39d51b57d24b (patch) | |
tree | c8ca1ec5480b95dcd229361f45e5fffbfc8287c2 /debian | |
parent | c3d4e5718262c0e385f641fbed055b00397fcbf6 (diff) | |
parent | dcdc8c3506f4da6d09e98937c299f9bf3f88a814 (diff) | |
download | mariadb-git-a62a675fd22d8d34d2cdec7dff4d39d51b57d24b.tar.gz |
Merge 10.5 into 10.6
Diffstat (limited to 'debian')
-rwxr-xr-x | debian/rules | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/rules b/debian/rules index 686c1c5e3dd..a79e8c2bd84 100755 --- a/debian/rules +++ b/debian/rules @@ -49,8 +49,8 @@ ifeq (32,$(DEB_HOST_ARCH_BITS)) endif # ColumnStore only attempts to build on a few platforms as dictated by CMake checks -# Also note in debian/control the CS-only build deps marked '[i386 amd64]' -ifeq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),amd64 i386)) +# Also note in debian/control the CS-only build deps marked '[amd64]' +ifeq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),amd64)) CMAKEFLAGS += -DPLUGIN_COLUMNSTORE=YES endif |