summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorYann Collet <cyan@fb.com>2018-02-01 01:18:57 (GMT)
committerYann Collet <cyan@fb.com>2018-02-01 01:18:57 (GMT)
commit5fd3ac7904ee85a0272b986b5178d89cb2ac8dc4 (patch)
tree5f1c5d6170c5d8d5447a1231fc4163300cc5539b /Makefile
parentb515ae9c9938700150bb4efba1eb78c6166293e0 (diff)
parentd1ccd620d62acb1863357aeb1bb64fe374b0d055 (diff)
downloadlz4-5fd3ac7904ee85a0272b986b5178d89cb2ac8dc4.zip
lz4-5fd3ac7904ee85a0272b986b5178d89cb2ac8dc4.tar.gz
lz4-5fd3ac7904ee85a0272b986b5178d89cb2ac8dc4.tar.bz2
Merge branch 'dev' into frameCompress
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile19
1 files changed, 8 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index d17b4a7..b48cfdd 100644
--- a/Makefile
+++ b/Makefile
@@ -160,17 +160,14 @@ platformTest: clean
versionsTest: clean
$(MAKE) -C $(TESTDIR) $@
-gpptest: clean
- g++ -v
- CC=g++ $(MAKE) -C $(LZ4DIR) all CFLAGS="-O3 -Wall -Wextra -Wundef -Wshadow -Wcast-align -Werror"
- CC=g++ $(MAKE) -C $(PRGDIR) all CFLAGS="-O3 -Wall -Wextra -Wundef -Wshadow -Wcast-align -Werror"
- CC=g++ $(MAKE) -C $(TESTDIR) all CFLAGS="-O3 -Wall -Wextra -Wundef -Wshadow -Wcast-align -Werror"
-
-gpptest32: clean
- g++ -v
- CC=g++ $(MAKE) -C $(LZ4DIR) all CFLAGS="-m32 -O3 -Wall -Wextra -Wundef -Wshadow -Wcast-align -Werror"
- CC=g++ $(MAKE) -C $(PRGDIR) native CFLAGS="-m32 -O3 -Wall -Wextra -Wundef -Wshadow -Wcast-align -Werror"
- CC=g++ $(MAKE) -C $(TESTDIR) native CFLAGS="-m32 -O3 -Wall -Wextra -Wundef -Wshadow -Wcast-align -Werror"
+gpptest gpptest32: CC = "$(CXX) -Wno-deprecated"
+gpptest gpptest32: CFLAGS = -O3 -Wall -Wextra -Wundef -Wshadow -Wcast-align -Werror
+gpptest32: CFLAGS += -m32
+gpptest gpptest32: clean
+ $(CXX) -v
+ CC=$(CC) $(MAKE) -C $(LZ4DIR) all CFLAGS="$(CFLAGS)"
+ CC=$(CC) $(MAKE) -C $(PRGDIR) all CFLAGS="$(CFLAGS)"
+ CC=$(CC) $(MAKE) -C $(TESTDIR) all CFLAGS="$(CFLAGS)"
c_standards: clean
# note : lz4 is not C90 compatible, because it requires long long support