summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJosh Haberman <jhaberman@gmail.com>2015-05-16 13:46:48 -0700
committerJosh Haberman <jhaberman@gmail.com>2015-05-16 14:18:22 -0700
commite087947c84ee6b7d86abe9585ee51efee7595a26 (patch)
treea7ca60b66be0f428645b15f71a7b1c4e190ddcf1 /Makefile
parent93791bfe65d210385ab1fb1eb1ccd77fca18b2bf (diff)
Enabled asserts() and verbosity for most Travis builds.
Also added a separate ndebug build for testing that -DNDEBUG builds still work. Also disabled reference debugging by default, since it requires either a global lock or -DUPB_THREAD_UNSAFE.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index d3ccfc0..b3f3d55 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ all: lib tests tools/upbc lua python
testall: test pythontest
# Set this to have user-specific flags (especially things like -O0 and -g).
-USER_CPPFLAGS=
+USER_CPPFLAGS?=
# Build with "make WITH_JIT=yes" (or anything besides "no") to enable the JIT.
WITH_JIT=no
@@ -72,7 +72,7 @@ ifneq ($(UPB_FAIL_WARNINGS), no)
endif
# Build with "make Q=" to see all commands that are being executed.
-Q=@
+Q?=@
# Function to expand a wildcard pattern recursively.
rwildcard=$(strip $(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2)$(filter $(subst *,%,$2),$d)))
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback