diff options
| author | Tavian Barnes <tavianator@tavianator.com> | 2022-03-11 11:26:40 -0500 |
|---|---|---|
| committer | Tavian Barnes <tavianator@tavianator.com> | 2022-03-11 11:37:22 -0500 |
| commit | d0a0be33568e3f244bd8e6b8395cb7b90165d026 (patch) | |
| tree | 36e78cfc4c958ec0202fdadeff392eeaea9a3c6c | |
| parent | 53a20612843282a906d962e9f7dfcab3183ccb1d (diff) | |
| download | bfs-d0a0be33568e3f244bd8e6b8395cb7b90165d026.tar.xz | |
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.
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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) |