diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-12-05 17:12:50 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-12-05 17:13:28 +0000 |
| commit | d7006cebbb5eea34aea8f5fd3470b7f4265d0625 (patch) | |
| tree | bfe2ea681df13fe12ba6b95b54f5fa1de7e20add /wiretap/Makefile.nmake | |
| parent | b7d1eedeb3cd7f3e0250dbe53828adfa10f4d06c (diff) | |
| download | wireshark-d7006cebbb5eea34aea8f5fd3470b7f4265d0625.tar.gz | |
Revert "Build Flex-generated files with "warnings are errors"."
This reverts commit b56f53884be3bab935058b2bbbb4da0b8bbbe7f6.
Sadly, we *do* get warnings at this point with older versions of Flex,
such as the one on the 32-bit OS X buildbot.
Change-Id: I9aec1a16e9f2e1bbcfaac3dffdabdd89af5815e3
Reviewed-on: https://code.wireshark.org/review/12443
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/Makefile.nmake')
| -rw-r--r-- | wiretap/Makefile.nmake | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/wiretap/Makefile.nmake b/wiretap/Makefile.nmake index e6d846e8b3..58ae255ec1 100644 --- a/wiretap/Makefile.nmake +++ b/wiretap/Makefile.nmake @@ -6,12 +6,16 @@ include ..\Makefile.nmake.inc include Makefile.common -CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \ +# We use GENERATED_CFLAGS to get around flex's non-LLP64-compliant output +GENERATED_CFLAGS=\ + $(STANDARD_CFLAGS) \ -DYYMALLOC=malloc -DYYFREE=free \ /I. /I.. $(GLIB_CFLAGS) \ $(ZLIB_CFLAGS) /I$(PCAP_DIR)/include \ -DWS_BUILD_DLL +CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS) + .c.obj:: $(CC) $(CFLAGS) -Fd.\ -c $< @@ -39,11 +43,11 @@ RUNLEX = ../tools/runlex.sh k12text_lex.h : k12text.c k12text.obj : k12text.c - $(CC) $(CFLAGS) -Fd.\ -c $? + $(CC) $(GENERATED_CFLAGS) -Fd.\ -c $? ascend_scanner_lex.h : ascend_scanner.c ascend_scanner.obj : ascend_scanner.c ascend.h - $(CC) $(CFLAGS) -Fd.\ -c ascend_scanner.c + $(CC) $(GENERATED_CFLAGS) -Fd.\ -c ascend_scanner.c ascend_scanner.c : ascend.h |