From d0a0be33568e3f244bd8e6b8395cb7b90165d026 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Fri, 11 Mar 2022 11:26:40 -0500 Subject: Makefile: Disable onig-config for the 32-bit distcheck build onig-config can redundantly add -L/usr/lib to LDLIBS, which results in a few warnings like /usr/bin/ld: skipping incompatible /usr/lib/libonig.so when searching for -lonig While I'm at it, explicitly restrict the -m32 build to Linux, since it doesn't work on FreeBSD and was only skipped because uname -m is amd64, not x86_64. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 8c5266b..9ae4bd1 100644 --- a/Makefile +++ b/Makefile @@ -255,9 +255,9 @@ distcheck: +$(MAKE) -B asan ubsan check $(DISTCHECK_FLAGS) ifneq ($(OS),Darwin) +$(MAKE) -B msan check CC=clang $(DISTCHECK_FLAGS) -ifeq ($(ARCH),x86_64) - +$(MAKE) -B check EXTRA_CFLAGS="-m32" $(DISTCHECK_FLAGS) endif +ifeq ($(OS) $(ARCH),Linux x86_64) + +$(MAKE) -B check EXTRA_CFLAGS="-m32" ONIG_CONFIG= $(DISTCHECK_FLAGS) endif +$(MAKE) -B release check $(DISTCHECK_FLAGS) +$(MAKE) -B check $(DISTCHECK_FLAGS) -- cgit v1.2.3