diff options
| author | Yossi Gottlieb <yossigo@gmail.com> | 2020-12-13 17:09:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-13 17:09:54 +0200 |
| commit | 86e3395c117d9450d52ee3ebbc62c386d11f1b79 (patch) | |
| tree | f01054125b9bf5db15095382a318c8f7d45804d6 /src/Makefile | |
| parent | f74c32cad27fcd078f7bb8517c87be178e7339eb (diff) | |
| download | redis-86e3395c117d9450d52ee3ebbc62c386d11f1b79.tar.gz | |
Several (mostly Solaris-related) cleanups (#8171)
* Allow runtest-moduleapi use a different 'make', for systems where GNU Make is 'gmake'.
* Fix issue with builds on Solaris re-building everything from scratch due to CFLAGS/LDFLAGS not stored.
* Fix compile failure on Solaris due to atomicvar and a bunch of warnings.
* Fix garbled log timestamps on Solaris.
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/Makefile b/src/Makefile index 653a6e6b0..0329da8c9 100644 --- a/src/Makefile +++ b/src/Makefile @@ -99,9 +99,11 @@ endif ifeq ($(uname_S),SunOS) # SunOS - ifneq ($(@@),32bit) - CFLAGS+= -m64 - LDFLAGS+= -m64 + ifeq ($(findstring -m32,$(FINAL_CFLAGS)),) + CFLAGS+=-m64 + endif + ifeq ($(findstring -m32,$(FINAL_LDFLAGS)),) + LDFLAGS+=-m64 endif DEBUG=-g DEBUG_FLAGS=-g |