diff options
| author |  Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2018-06-25 14:45:08 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-06-25 14:45:08 -0700 |
| commit | 9789fa49fd6468b358ff9a2bad4cc2248b239394 (patch) | |
| tree | 33f78cd5d237449f6e2c73548a78c814b221d65f /templates | |
| parent | e0198fce70c3f79475f63860af7c46840496765d (diff) | |
| parent | b71da61dd16b73ff1f12056ad418f31900ae8f8f (diff) | |
Merge pull request #15748 from nicolasnoble/libcxxabi
Skeleton of libcxxabi's usage.
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/Makefile.template | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/templates/Makefile.template b/templates/Makefile.template index 4a04af122d..1027851b7b 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -37,10 +37,10 @@ # warnings we'd like, but that dont exist in all compilers PREFERRED_WARNINGS=['shadow', 'extra-semi'] - CHECK_WARNINGS=PREFERRED_WARNINGS + ['no-shift-negative-value'] + CHECK_WARNINGS=PREFERRED_WARNINGS + ['no-shift-negative-value', 'no-unused-but-set-variable'] def warning_var(fmt, warning): - return fmt % warning.replace('-', '_').upper() + return fmt % warning.replace('-', '_').replace('+', 'X').upper() def neg_warning(warning): if warning[0:3] == 'no-': @@ -191,6 +191,12 @@ TMPOUT = `mktemp /tmp/test-out-XXXXXX` endif + CHECK_NO_CXX14_COMPAT_WORKS_CMD = $(CC) -std=c++11 -Werror -Wno-c++14-compat -o $(TMPOUT) -c test/build/no-c++14-compat.cc + HAS_WORKING_NO_CXX14_COMPAT = $(shell $(CHECK_NO_CXX14_COMPAT_WORKS_CMD) 2> /dev/null && echo true || echo false) + ifeq ($(HAS_WORKING_NO_CXX14_COMPAT),true) + W_NO_CXX14_COMPAT=-Wno-c++14-compat + endif + %for warning in CHECK_WARNINGS: ${warning_var('CHECK_%s_WORKS_CMD', warning)} = $(CC) -std=c99 -Werror -W${warning} -o $(TMPOUT) -c test/build/${warning}.c ${warning_var('HAS_WORKING_%s', warning)} = $(shell $(${warning_var('CHECK_%s_WORKS_CMD', warning)}) 2> /dev/null && echo true || echo false) @@ -1271,6 +1277,11 @@ $(Q) mkdir -p `dirname $@` $(Q) $(CXX) $(CPPFLAGS) $(CXXFLAGS) -MMD -MF $(addsuffix .dep, $(basename $@)) -c -o $@ $< + $(OBJDIR)/$(CONFIG)/%.o : %.cpp + $(E) "[CXX] Compiling $<" + $(Q) mkdir -p `dirname $@` + $(Q) $(CXX) $(CPPFLAGS) $(CXXFLAGS) -MMD -MF $(addsuffix .dep, $(basename $@)) -c -o $@ $< + install: install_c install_cxx install-plugins install-certs install_c: install-headers_c install-static_c install-shared_c |