AuroraMiddleware/lz4
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix CFLAGS unexport issue

Browse Source
This commit is contained in:
Yann Collet 2020-11-30 17:42:36 -08:00
parent 5a551754cf
commit 19564bce78
5 changed files with 45 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.circleci/config.yml
View File

@ -44,7 +44,7 @@ jobs:
# This would typically be a build job when using workflows, possibly combined with build # This would typically be a build job when using workflows, possibly combined with build
# This is based on your 1.0 configuration file or project settings # This is based on your 1.0 configuration file or project settings
- run: CFLAGS= make clangtest && make clean - run: CFLAGS= make clangtest && make clean
- run: g++ -v; make gpptest && make clean - run: g++ -v; make cxxtest && make clean
- run: gcc -v; g++ -v; make ctocpptest && make clean - run: gcc -v; g++ -v; make ctocpptest && make clean
- run: gcc-5 -v; CC=gcc-5 CFLAGS="-O2 -Werror" make check && make clean - run: gcc-5 -v; CC=gcc-5 CFLAGS="-O2 -Werror" make check && make clean
- run: gcc-5 -v; CC=gcc-5 CFLAGS="-O2 -m32 -Werror" CPPFLAGS=-I/usr/include/x86_64-linux-gnu make check && make clean - run: gcc-5 -v; CC=gcc-5 CFLAGS="-O2 -m32 -Werror" CPPFLAGS=-I/usr/include/x86_64-linux-gnu make check && make clean

2
.travis.yml
View File

@ -44,7 +44,7 @@ matrix:
- name: (Precise) g++ and clang CMake test - name: (Precise) g++ and clang CMake test
dist: precise dist: precise
script: script:
- make gpptest - make cxxtest
- make clean - make clean
- make examples - make examples
- make clean cmake - make clean cmake

69
Makefile
View File

@ -1,6 +1,6 @@
# ################################################################ # ################################################################
# LZ4 - Makefile # LZ4 - Makefile
# Copyright (C) Yann Collet 2011-present # Copyright (C) Yann Collet 2011-2020
# All rights reserved. # All rights reserved.
# #
# BSD license # BSD license
@ -36,17 +36,7 @@ TESTDIR = tests
EXDIR = examples EXDIR = examples
FUZZDIR = ossfuzz FUZZDIR = ossfuzz
#include Makefile.inc include Makefile.inc
#determine if dev/nul based on host environment
ifneq (,$(filter MINGW% MSYS% CYGWIN%,$(shell uname)))
VOID := /dev/null
else
ifneq (,$(filter Windows%,$(OS)))
VOID := nul
else
VOID := /dev/null
endif
endif
.PHONY: default .PHONY: default
@ -108,13 +98,15 @@ install uninstall:
$(MAKE) -C $(LZ4DIR) $@ $(MAKE) -C $(LZ4DIR) $@
$(MAKE) -C $(PRGDIR) $@ $(MAKE) -C $(PRGDIR) $@
.PHONY: travis-install
travis-install: travis-install:
$(MAKE) -j1 install DESTDIR=~/install_test_dir $(MAKE) -j1 install DESTDIR=~/install_test_dir
.PHONY: cmake
cmake: cmake:
cd build/cmake; cmake $(CMAKE_PARAMS) CMakeLists.txt; $(MAKE) cd build/cmake; cmake $(CMAKE_PARAMS) CMakeLists.txt; $(MAKE)
endif endif # POSIX_ENV
ifneq (,$(filter MSYS%,$(shell uname))) ifneq (,$(filter MSYS%,$(shell uname)))
@ -138,43 +130,54 @@ check:
.PHONY: test .PHONY: test
test: test:
CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" $(MAKE) -C $(TESTDIR) $@ $(MAKE) -C $(TESTDIR) $@
CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" $(MAKE) -C $(EXDIR) $@ $(MAKE) -C $(EXDIR) $@
clangtest: CFLAGS ?= -O3 .PHONY: clangtest
clangtest: CFLAGS ?= -O3 # strangely, this line has the hidden side effect of `unexport CFLAGS`
export CFLAGS # fix the side effect by issuing export command
clangtest: CFLAGS += -Werror -Wconversion -Wno-sign-conversion clangtest: CFLAGS += -Werror -Wconversion -Wno-sign-conversion
clangtest: CC = clang clangtest: CC = clang
clangtest: clean clangtest: clean
$(CC) -v $(CC) -v
CFLAGS="$(CFLAGS)" $(MAKE) -C $(LZ4DIR) all CC=$(CC) $(MAKE) -C $(LZ4DIR) all CC=$(CC)
CFLAGS="$(CFLAGS)" $(MAKE) -C $(PRGDIR) all CC=$(CC) $(MAKE) -C $(PRGDIR) all CC=$(CC)
CFLAGS="$(CFLAGS)" $(MAKE) -C $(TESTDIR) all CC=$(CC) $(MAKE) -C $(TESTDIR) all CC=$(CC)
.PHONY: clangtest-native
clangtest-native: CFLAGS = -O3 -Werror -Wconversion -Wno-sign-conversion
clangtest-native: clean clangtest-native: clean
clang -v clang -v
CFLAGS="-O3 -Werror -Wconversion -Wno-sign-conversion" $(MAKE) -C $(LZ4DIR) all CC=clang $(MAKE) -C $(LZ4DIR) all CC=clang
CFLAGS="-O3 -Werror -Wconversion -Wno-sign-conversion" $(MAKE) -C $(PRGDIR) native CC=clang $(MAKE) -C $(PRGDIR) native CC=clang
CFLAGS="-O3 -Werror -Wconversion -Wno-sign-conversion" $(MAKE) -C $(TESTDIR) native CC=clang $(MAKE) -C $(TESTDIR) native CC=clang
.PHONY: usan
usan: CC = clang usan: CC = clang
usan: CFLAGS = -O3 -g -fsanitize=undefined -fno-sanitize-recover=undefined -fsanitize-recover=pointer-overflow usan: CFLAGS = -O3 -g -fsanitize=undefined -fno-sanitize-recover=undefined -fsanitize-recover=pointer-overflow
usan: LDFLAGS = $(CFLAGS) usan: LDFLAGS = $(CFLAGS)
usan: clean usan: clean
CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" $(MAKE) test FUZZER_TIME="-T30s" NB_LOOPS=-i1 $(MAKE) test FUZZER_TIME="-T30s" NB_LOOPS=-i1
.PHONY: usan32
usan32: CFLAGS = -m32 -O3 -g -fsanitize=undefined
usan32: LDFLAGS = $(CFLAGS)
usan32: clean usan32: clean
CFLAGS="-m32 -O3 -g -fsanitize=undefined" $(MAKE) test FUZZER_TIME="-T30s" NB_LOOPS=-i1 $(MAKE) test FUZZER_TIME="-T30s" NB_LOOPS=-i1
SCANBUILD ?= scan-build SCANBUILD ?= scan-build
SCANBUILD_FLAGS += --status-bugs -v --force-analyze-debug-code SCANBUILD_FLAGS += --status-bugs -v --force-analyze-debug-code
.PHONY: staticAnalyze .PHONY: staticAnalyze
staticAnalyze: CPPFLAGS = -DLZ4_DEBUG=1
staticAnalyze: CFLAGS = -g
staticAnalyze: clean staticAnalyze: clean
CPPFLAGS=-DLZ4_DEBUG=1 CFLAGS=-g $(SCANBUILD) $(SCANBUILD_FLAGS) $(MAKE) all V=1 DEBUGLEVEL=1 $(SCANBUILD) $(SCANBUILD_FLAGS) $(MAKE) all V=1 DEBUGLEVEL=1
.PHONY: cppcheck .PHONY: cppcheck
cppcheck: cppcheck:
cppcheck . --force --enable=warning,portability,performance,style --error-exitcode=1 > /dev/null cppcheck . --force --enable=warning,portability,performance,style --error-exitcode=1 > /dev/null
.PHONY: platformTest
platformTest: clean platformTest: clean
@echo "\n ---- test lz4 with $(CC) compiler ----" @echo "\n ---- test lz4 with $(CC) compiler ----"
$(CC) -v $(CC) -v
@ -187,15 +190,17 @@ platformTest: clean
versionsTest: clean versionsTest: clean
$(MAKE) -C $(TESTDIR) $@ $(MAKE) -C $(TESTDIR) $@
gpptest gpptest32: CC = "$(CXX) -Wno-deprecated" .PHONY: cxxtest cxx32test
gpptest gpptest32: CFLAGS = -O3 -Wall -Wextra -Wundef -Wshadow -Wcast-align -Werror cxxtest cxx32test: CC = "$(CXX) -Wno-deprecated"
gpptest32: CFLAGS += -m32 cxxtest cxx32test: CFLAGS = -O3 -Wall -Wextra -Wundef -Wshadow -Wcast-align -Werror
gpptest gpptest32: clean cxx32test: CFLAGS += -m32
cxxtest cxx32test: clean
$(CXX) -v $(CXX) -v
CC=$(CC) $(MAKE) -C $(LZ4DIR) all CFLAGS="$(CFLAGS)" CC=$(CC) $(MAKE) -C $(LZ4DIR) all CFLAGS="$(CFLAGS)"
CC=$(CC) $(MAKE) -C $(PRGDIR) all CFLAGS="$(CFLAGS)" CC=$(CC) $(MAKE) -C $(PRGDIR) all CFLAGS="$(CFLAGS)"
CC=$(CC) $(MAKE) -C $(TESTDIR) all CFLAGS="$(CFLAGS)" CC=$(CC) $(MAKE) -C $(TESTDIR) all CFLAGS="$(CFLAGS)"
.PHONY: cxx17build
cxx17build : CC = "$(CXX) -Wno-deprecated" cxx17build : CC = "$(CXX) -Wno-deprecated"
cxx17build : CFLAGS = -std=c++17 -Wall -Wextra -Wundef -Wshadow -Wcast-align -Werror -pedantic cxx17build : CFLAGS = -std=c++17 -Wall -Wextra -Wundef -Wshadow -Wcast-align -Werror -pedantic
cxx17build : clean cxx17build : clean
@ -204,14 +209,16 @@ cxx17build : clean
CC=$(CC) $(MAKE) -C $(PRGDIR) all CFLAGS="$(CFLAGS)" CC=$(CC) $(MAKE) -C $(PRGDIR) all CFLAGS="$(CFLAGS)"
CC=$(CC) $(MAKE) -C $(TESTDIR) all CFLAGS="$(CFLAGS)" CC=$(CC) $(MAKE) -C $(TESTDIR) all CFLAGS="$(CFLAGS)"
.PHONY: ctocpptest
ctocpptest: LIBCC="$(CC)" ctocpptest: LIBCC="$(CC)"
ctocpptest: TESTCC="$(CXX)" ctocpptest: TESTCC="$(CXX)"
ctocpptest: CFLAGS="" ctocpptest: CFLAGS=
ctocpptest: clean ctocpptest: clean
CC=$(LIBCC) $(MAKE) -C $(LZ4DIR) CFLAGS="$(CFLAGS)" all CC=$(LIBCC) $(MAKE) -C $(LZ4DIR) CFLAGS="$(CFLAGS)" all
CC=$(LIBCC) $(MAKE) -C $(TESTDIR) CFLAGS="$(CFLAGS)" lz4.o lz4hc.o lz4frame.o CC=$(LIBCC) $(MAKE) -C $(TESTDIR) CFLAGS="$(CFLAGS)" lz4.o lz4hc.o lz4frame.o
CC=$(TESTCC) $(MAKE) -C $(TESTDIR) CFLAGS="$(CFLAGS)" all CC=$(TESTCC) $(MAKE) -C $(TESTDIR) CFLAGS="$(CFLAGS)" all
.PHONY: c_standards
c_standards: clean c_standards: clean
$(MAKE) clean; CFLAGS="-std=c90 -Werror -pedantic -Wno-long-long -Wno-variadic-macros" $(MAKE) allmost $(MAKE) clean; CFLAGS="-std=c90 -Werror -pedantic -Wno-long-long -Wno-variadic-macros" $(MAKE) allmost
$(MAKE) clean; CFLAGS="-std=gnu90 -Werror -pedantic -Wno-long-long -Wno-variadic-macros" $(MAKE) allmost $(MAKE) clean; CFLAGS="-std=gnu90 -Werror -pedantic -Wno-long-long -Wno-variadic-macros" $(MAKE) allmost
@ -219,4 +226,4 @@ c_standards: clean
$(MAKE) clean; CFLAGS="-std=gnu99 -Werror -pedantic" $(MAKE) all $(MAKE) clean; CFLAGS="-std=gnu99 -Werror -pedantic" $(MAKE) all
$(MAKE) clean; CFLAGS="-std=c11 -Werror" $(MAKE) all $(MAKE) clean; CFLAGS="-std=c11 -Werror" $(MAKE) all
endif endif # MSYS POSIX

8
contrib/gen_manual/Makefile
View File

@ -30,10 +30,10 @@
# ################################################################ # ################################################################
CXXFLAGS ?= -O3 CXXFLAGS ?= -O2
CXXFLAGS += -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow -Wstrict-aliasing=1 -Wswitch-enum -Wno-comment CXXFLAGS += -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow -Wstrict-aliasing=1 -Wswitch-enum -Wno-comment
CXXFLAGS += $(MOREFLAGS) CPPFLAGS += $(MOREFLAGS)
FLAGS = $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) FLAGS = $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS)
LZ4API = ../../lib/lz4.h LZ4API = ../../lib/lz4.h
LZ4MANUAL = ../../doc/lz4_manual.html LZ4MANUAL = ../../doc/lz4_manual.html
@ -68,7 +68,7 @@ $(LZ4FMANUAL) : gen_manual $(LZ4FAPI)
./gen_manual $(LZ4VER) $(LZ4FAPI) $@ ./gen_manual $(LZ4VER) $(LZ4FAPI) $@
.PHONY: manuals .PHONY: manuals
manuals: gen_manual $(LZ4MANUAL) $(LZ4FMANUAL) manuals: $(LZ4MANUAL) $(LZ4FMANUAL)
.PHONY: clean .PHONY: clean
clean: clean:

2
tests/Makefile
View File

@ -1,6 +1,6 @@
# ########################################################################## # ##########################################################################
# LZ4 programs - Makefile # LZ4 programs - Makefile
# Copyright (C) Yann Collet 2011-present # Copyright (C) Yann Collet 2011-2020
# #
# GPL v2 License # GPL v2 License
# #