diff options
author | Tor Andersson <tor.andersson@artifex.com> | 2017-12-13 14:56:28 +0100 |
---|---|---|
committer | Tor Andersson <tor.andersson@artifex.com> | 2017-12-13 21:05:30 +0100 |
commit | a66a5541639ffac0a5265616f652f7663804dc87 (patch) | |
tree | e13d2256b6987fc64d1fa6d0579d56a588e64ea5 | |
parent | eacd070190d0c7a7fbc905a2a292f38e282b5a82 (diff) | |
download | mupdf-a66a5541639ffac0a5265616f652f7663804dc87.tar.xz |
Don't pass -Wdeclaration-after-statement to C++ compiler.
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | Makethird | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -72,7 +72,7 @@ QUIET_WINDRES = @ echo ' ' ' ' WINDRES $@ ; endif CC_CMD = $(QUIET_CC) $(CC) $(CFLAGS) -o $@ -c $< -CXX_CMD = $(QUIET_CXX) $(CXX) $(CFLAGS) -o $@ -c $< +CXX_CMD = $(QUIET_CXX) $(CXX) $(filter-out -Wdeclaration-after-statement,$(CFLAGS)) -o $@ -c $< AR_CMD = $(QUIET_AR) $(AR) cr $@ $^ LINK_CMD = $(QUIET_LINK) $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) MKDIR_CMD = $(QUIET_MKDIR) mkdir -p $@ @@ -164,7 +164,7 @@ HARFBUZZ_OBJ := $(addprefix $(HARFBUZZ_OUT)/, $(HARFBUZZ_SRC:%.cc=%.o)) $(HARFBUZZ_OUT): $(MKDIR_CMD) $(HARFBUZZ_OUT)/%.o: $(HARFBUZZ_DIR)/src/%.cc | $(HARFBUZZ_OUT) - $(CC_CMD) -DHAVE_OT -DHAVE_UCDN -DHB_NO_MT $(FREETYPE_CFLAGS) \ + $(CXX_CMD) -DHAVE_OT -DHAVE_UCDN -DHB_NO_MT $(FREETYPE_CFLAGS) \ -Dhb_malloc_impl=fz_hb_malloc -Dhb_calloc_impl=fz_hb_calloc \ -Dhb_free_impl=fz_hb_free -Dhb_realloc_impl=fz_hb_realloc \ -fno-rtti -fno-exceptions -fvisibility-inlines-hidden --std=c++0x |