From 4c36603efbdbe64e42001284d9814c48d976927f Mon Sep 17 00:00:00 2001 From: Chris Rudd Date: Tue, 16 Jun 2020 13:29:12 -0500 Subject: [PATCH] fixup! Support for 32 bit linux builds and gcc 4.9 --- azure-pipelines.yml | 4 ++-- tests/__init__.py | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5210d0ece..f389f8117 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -18,8 +18,8 @@ stages: matrix: Linux (gcc 7, 32-bit): vmImage: "ubuntu-18.04" - CC: gcc-7 -m32 - CXX: g++-7 -m32 + CC: gcc-7 + CXX: g++-7 TEST_X86: 1 Linux (gcc 9): vmImage: "ubuntu-latest" diff --git a/tests/__init__.py b/tests/__init__.py index 8d2500e61..66621dbbd 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -102,6 +102,8 @@ def cmake(cwd, targets, options=None): configcmd.append("-D{}={}".format(key, value)) if sys.platform == "win32" and os.environ.get("TEST_X86"): configcmd.append("-AWin32") + else if sys.platform == "linux" and os.environ.get("TEST_X86"): + configcmd.append("-DSENTRY_BUILD_FORCE32=ON") cmakelists_dir = os.path.dirname(os.path.dirname(os.path.realpath(__file__))) configcmd.append(cmakelists_dir)