diff options
| -rw-r--r-- | .travis.yml | 9 | ||||
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | lib/Makefile | 1 | ||||
| -rw-r--r-- | programs/Makefile | 3 | ||||
| -rw-r--r-- | tests/Makefile | 3 |
5 files changed, 15 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml index 35088fa..fd9bf31 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,8 +36,7 @@ matrix: - qemu-system-arm - qemu-user-static - gcc-arm-linux-gnueabi - - libc6-dev-armel-cross - - linux-libc-dev-armel-cross + - libc6-dev-i386 - env: Ubu=14.04 Cmd='make platformTest CC=aarch64-linux-gnu-gcc QEMU_SYS=qemu-aarch64-static' COMPILER=aarch64-linux-gnu-gcc dist: trusty @@ -49,7 +48,7 @@ matrix: - qemu-user-static - gcc-aarch64-linux-gnu - - env: Ubu=14.04 Cmd='make platformTest CC=powerpc-linux-gnu-gcc QEMU_SYS=qemu-ppc-static' COMPILER=powerpc-linux-gnu-gcc + - env: Ubu=14.04 Cmd='make platformTest CC=powerpc-linux-gnu-gcc QEMU_SYS=qemu-ppc-static && make platformTest CC=powerpc-linux-gnu-gcc QEMU_SYS=qemu-ppc64-static MOREFLAGS=-m64' COMPILER=powerpc-linux-gnu-gcc dist: trusty sudo: required addons: @@ -75,7 +74,7 @@ matrix: - python3 - libc6-dev-i386 - gcc-multilib - - env: Ubu=14.04 Cmd='make -C tests test-lz4 test-lz4c32 CC=gcc-5 MOREFLAGS="-Werror"' COMPILER=gcc-5 + - env: Ubu=14.04 Cmd='make -C tests test-lz4 test-lz4c32 CC=gcc-5 MOREFLAGS=-Werror' COMPILER=gcc-5 dist: trusty sudo: required addons: @@ -87,7 +86,7 @@ matrix: - gcc-multilib - gcc-5 - gcc-5-multilib - - env: Ubu=14.04 Cmd='make c_standards CC=gcc-6 && make -C tests test-lz4 CC=gcc-6 MOREFLAGS="-Werror"' COMPILER=gcc-6 + - env: Ubu=14.04 Cmd='make c_standards CC=gcc-6 && make -C tests test-lz4 CC=gcc-6 MOREFLAGS=-Werror' COMPILER=gcc-6 dist: trusty sudo: required addons: @@ -107,18 +107,18 @@ c_standards: clean $(MAKE) clean clangtest: clean - $(MAKE) all CC=clang CFLAGS="-O3 -Werror -Wconversion -Wno-sign-conversion" + CFLAGS="-O3 -Werror -Wconversion -Wno-sign-conversion" $(MAKE) all CC=clang sanitize: clean - $(MAKE) test CC=clang FUZZER_TIME="-T1mn" NB_LOOPS=-i1 CFLAGS="-O3 -g -fsanitize=undefined" + CFLAGS="-O3 -g -fsanitize=undefined" $(MAKE) test CC=clang FUZZER_TIME="-T1mn" NB_LOOPS=-i1 staticAnalyze: clean - scan-build --status-bugs -v $(MAKE) all CFLAGS=-g + CFLAGS=-g scan-build --status-bugs -v $(MAKE) all platformTest: clean - $(MAKE) -C $(LZ4DIR) all MOREFLAGS="-Werror" - $(MAKE) -C $(PRGDIR) bins MOREFLAGS="-Werror -static" - $(MAKE) -C $(TESTDIR) bins MOREFLAGS="-Werror -static" + CFLAGS="-O3 -Werror" $(MAKE) -C $(LZ4DIR) all + CFLAGS="-O3 -Werror -static" $(MAKE) -C $(PRGDIR) bins + CFLAGS="-O3 -Werror -static" $(MAKE) -C $(TESTDIR) bins $(MAKE) -C $(TESTDIR) test-platform versionsTest: clean diff --git a/lib/Makefile b/lib/Makefile index 8b2cbff..e3f1c7a 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -49,6 +49,7 @@ CFLAGS ?= -O3 CFLAGS += -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow \ -Wswitch-enum -Wdeclaration-after-statement -Wstrict-prototypes -Wundef \ -Wpointer-arith # -Wstrict-aliasing=1 +CFLAGS += $(MOREFLAGS) FLAGS = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) LIBDIR?= $(PREFIX)/lib diff --git a/programs/Makefile b/programs/Makefile index 9d8929a..39672b3 100644 --- a/programs/Makefile +++ b/programs/Makefile @@ -36,8 +36,9 @@ LZ4DIR := ../lib CFLAGS ?= -O3 # can select custom flags. For example : CFLAGS="-O2 -g" make CFLAGS += -Wall -Wextra -Wundef -Wcast-qual -Wcast-align -Wshadow -Wswitch-enum -Wdeclaration-after-statement -Wstrict-prototypes -Wpointer-arith +CFLAGS += $(MOREFLAGS) CPPFLAGS:= -I$(LZ4DIR) -DXXH_NAMESPACE=LZ4_ -DLZ4_DLL_EXPORT=1 -FLAGS := $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(MOREFLAGS) +FLAGS := $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) # Define *.exe as extension for Windows systems diff --git a/tests/Makefile b/tests/Makefile index d901647..ecc395b 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -43,8 +43,9 @@ PYTHON?= python3 CFLAGS ?= -O3 # can select custom flags. For example : CFLAGS="-O2 -g" make CFLAGS += -Wall -Wextra -Wundef -Wcast-qual -Wcast-align -Wshadow -Wswitch-enum -Wdeclaration-after-statement -Wstrict-prototypes +CFLAGS += $(MOREFLAGS) CPPFLAGS:= -I$(LZ4DIR) -DXXH_NAMESPACE=LZ4_ -DLZ4_DLL_EXPORT=1 -FLAGS := $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(MOREFLAGS) +FLAGS := $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) # Define *.exe as extension for Windows systems |