diff options
| author | Josh MacDonald <josh.macdonald@gmail.com> | 2015-10-20 22:22:37 -0700 |
|---|---|---|
| committer | Josh MacDonald <josh.macdonald@gmail.com> | 2015-10-20 22:22:37 -0700 |
| commit | f0e657823b1999ddeb7156d91be29e310ae2ec64 (patch) | |
| tree | dc920b87c85a6667f7fcc37fada455da30ab4992 /xdelta3/Makefile.am | |
| parent | 413efde5877d8a6983ef5f567c2739d617f5cd86 (diff) | |
Revert temporary ASAN changes; enable VCDIFF_TOOLS for MINGW32 builds (as noted in https://github.com/jmacd/xdelta/issues/205)
Diffstat (limited to 'xdelta3/Makefile.am')
| -rw-r--r-- | xdelta3/Makefile.am | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/xdelta3/Makefile.am b/xdelta3/Makefile.am index aaf8fb9..73895b6 100644 --- a/xdelta3/Makefile.am +++ b/xdelta3/Makefile.am | |||
| @@ -40,10 +40,8 @@ xdelta3regtest_SOURCES = $(common_SOURCES) \ | |||
| 40 | WFLAGS = -Wall -Wshadow -fno-builtin -Wextra -Wsign-compare \ | 40 | WFLAGS = -Wall -Wshadow -fno-builtin -Wextra -Wsign-compare \ |
| 41 | -Wextra -Wno-unused-parameter -Wno-unused-function | 41 | -Wextra -Wno-unused-parameter -Wno-unused-function |
| 42 | 42 | ||
| 43 | # TODO: DO NOT RELEASE | 43 | C_WFLAGS = $(WFLAGS) -pedantic -std=c99 |
| 44 | ASAN = -fno-omit-frame-pointer -fsanitize=address | 44 | CXX_WFLAGS = $(WFLAGS) |
| 45 | C_WFLAGS = $(WFLAGS) -pedantic -std=c99 $(ASAN) | ||
| 46 | CXX_WFLAGS = $(WFLAGS) $(ASAN) | ||
| 47 | 45 | ||
| 48 | common_CFLAGS = \ | 46 | common_CFLAGS = \ |
| 49 | -DREGRESSION_TEST=1 \ | 47 | -DREGRESSION_TEST=1 \ |