diff options
| author | Lukas Larsson <lukas@erlang.org> | 2021-01-13 10:29:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-13 10:29:44 +0100 |
| commit | 8cc56ab98c935168c7935ab564eb2c60f907406c (patch) | |
| tree | 0f589d034823354f81ddafdc4db2c9cad249f857 /erts/emulator/Makefile.in | |
| parent | f71dbfb082d8db8cde8b26737ada2493e4eed3df (diff) | |
| parent | ab920443004e1ac0d56140035514515253864007 (diff) | |
| download | erlang-8cc56ab98c935168c7935ab564eb2c60f907406c.tar.gz | |
Merge pull request #2872 from garazdawi/lukas/fix-configure-werror/OTP-17105
Add -Werror to github actions C/C++ compilation
Diffstat (limited to 'erts/emulator/Makefile.in')
| -rw-r--r-- | erts/emulator/Makefile.in | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in index fcc302e4c8..726845e7b8 100644 --- a/erts/emulator/Makefile.in +++ b/erts/emulator/Makefile.in @@ -843,8 +843,8 @@ $(OBJDIR)/%.o: nifs/$(ERLANG_OSTYPE)/%.c # included before any other directives, including other #includes. # ASMJIT_FLAGS=-DASMJIT_EMBED=1 -DASMJIT_NO_BUILDER=1 -DASMJIT_NO_DEPRECATED=1 -DASMJIT_STATIC=1 -ASMJIT_PCH_OBJ=$(TTF_DIR)/asmjit/asmjit.h.gch -ASMJIT_PCH_SRC=$(TTF_DIR)/asmjit/asmjit.h +ASMJIT_PCH_OBJ=$(TTF_DIR)/asmjit/asmjit.hpp.gch +ASMJIT_PCH_SRC=$(TTF_DIR)/asmjit/asmjit.hpp $(OBJDIR)/%.o: beam/jit/%.cpp beam/jit/beam_asm.hpp $(ASMJIT_PCH_OBJ) $(V_CXX) $(ASMJIT_FLAGS) $(INCLUDES) \ @@ -865,6 +865,8 @@ $(ASMJIT_PCH_OBJ): $(ASMJIT_PCH_SRC) $(ASMJIT_TTF_H) beam/erl_bif_info.c ## We copy all asmjit headers into TTF_DIR in order for cross-compilation ## with pre-compiled header to work. +$(TTF_DIR)/asmjit/asmjit.hpp: asmjit/asmjit.h + $(V_at)cp $< $@ $(TTF_DIR)/asmjit/%.h: asmjit/%.h $(V_at)cp $< $@ @@ -1183,6 +1185,7 @@ SED_REPL_TTF_DIR=s|$(TTF_DIR)/|$$(TTF_DIR)/|g SED_REPL_ERL_TOP=s|\([ ]\)$(ERL_TOP)/|\1$$(ERL_TOP)/|g;s|^$(ERL_TOP)/|$$(ERL_TOP)/|g SED_REPL_POLL=s|$$(OBJDIR)/erl_poll.o|$$(OBJDIR)/erl_poll.o $$(OBJDIR)/erl_poll.flbk.o|g SED_REPL_TTF_COMP_FLAGS=s|\([^/]\)erl_compile_flags\.h|\1$$(TTF_DIR)/erl_compile_flags\.h|g +SED_ASMJIT_HPP_FLAGS=s|\([^/]\)asmjit/asmjit\.hpp|\1$$(TTF_DIR)/asmjit/asmjit\.hpp|g ifeq ($(TARGET),win32) #SED_PREFIX=$(SED_REPL_WIN_DRIVE); @@ -1197,7 +1200,7 @@ else SED_SUFFIX= endif -SED_DEPEND=sed '$(SED_PREFIX)$(SED_REPL_O);$(SED_REPL_TTF_DIR);$(SED_REPL_ERL_TOP)$(SED_SUFFIX);$(SED_REPL_TTF_COMP_FLAGS)' +SED_DEPEND=sed '$(SED_PREFIX)$(SED_REPL_O);$(SED_REPL_TTF_DIR);$(SED_REPL_ERL_TOP)$(SED_SUFFIX);$(SED_REPL_TTF_COMP_FLAGS);$(SED_ASMJIT_HPP_FLAGS)' SED_DEPEND_ZLIB=sed '$(SED_PREFIX)$(SED_REPL_O_ZLIB)' BEAM_SRC=$(wildcard beam/*.c) |