|
 |
d8d49b |
From: Sverker Eriksson <sverker@erlang.org>
|
|
|
d8d49b |
Date: Wed, 9 Nov 2016 16:52:23 +0100
|
|
|
d8d49b |
Subject: [PATCH] erts: Fix correct link flags for hipe_mkliterals
|
|
|
d8d49b |
|
|
|
d8d49b |
and no need for $(INCLUDED).
|
|
|
d8d49b |
|
|
|
d8d49b |
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in
|
|
|
d8d49b |
index e026020..8772bef 100644
|
|
|
d8d49b |
--- a/erts/emulator/Makefile.in
|
|
|
d8d49b |
+++ b/erts/emulator/Makefile.in
|
|
|
d8d49b |
@@ -49,6 +49,7 @@ CREATE_DIRS=
|
|
|
d8d49b |
LDFLAGS=@LDFLAGS@
|
|
|
d8d49b |
ARFLAGS=rc
|
|
|
d8d49b |
OMIT_OMIT_FP=no
|
|
|
d8d49b |
+TYPE_LIBS=
|
|
|
d8d49b |
|
|
|
d8d49b |
DIRTY_SCHEDULER_SUPPORT=@DIRTY_SCHEDULER_SUPPORT@
|
|
|
d8d49b |
NEW_PURGE_STRATEGY=@NEW_PURGE_STRATEGY@
|
|
|
d8d49b |
@@ -90,7 +91,7 @@ PURIFY =
|
|
|
d8d49b |
TYPEMARKER = .gcov
|
|
|
d8d49b |
TYPE_FLAGS = $(DEBUG_CFLAGS) -DERTS_GCOV -DNO_JUMP_TABLE -fprofile-arcs -ftest-coverage -O0 -DERTS_CAN_INLINE=0 -DERTS_INLINE=
|
|
|
d8d49b |
ifneq ($(findstring solaris,$(TARGET)),solaris)
|
|
|
d8d49b |
-LIBS += -lgcov
|
|
|
d8d49b |
+TYPE_LIBS = -lgcov
|
|
|
d8d49b |
endif
|
|
|
d8d49b |
ENABLE_ALLOC_TYPE_VARS += debug
|
|
|
d8d49b |
else
|
|
|
d8d49b |
@@ -146,6 +147,8 @@ endif
|
|
|
d8d49b |
endif
|
|
|
d8d49b |
endif
|
|
|
d8d49b |
|
|
|
d8d49b |
+LIBS += $(TYPE_LIBS)
|
|
|
d8d49b |
+
|
|
|
d8d49b |
comma:=,
|
|
|
d8d49b |
space:=
|
|
|
d8d49b |
space+=
|
|
|
d8d49b |
@@ -931,7 +934,7 @@ $(OBJDIR)/%.o: hipe/%.c
|
|
|
d8d49b |
$(V_CC) $(subst O2,O3, $(CFLAGS)) $(INCLUDES) -c $< -o $@
|
|
|
d8d49b |
|
|
|
d8d49b |
$(BINDIR)/hipe_mkliterals$(TF_MARKER): $(OBJDIR)/hipe_mkliterals.o
|
|
|
d8d49b |
- $(ld_verbose)$(CC) $(CFLAGS) $(INCLUDES) -o $@ $<
|
|
|
d8d49b |
+ $(ld_verbose)$(CC) $(LDFLAGS) -o $@ $< $(TYPE_LIBS)
|
|
|
d8d49b |
|
|
|
d8d49b |
$(OBJDIR)/hipe_mkliterals.o: $(HIPE_ASM) $(TTF_DIR)/erl_alloc_types.h $(DTRACE_HEADERS) \
|
|
|
d8d49b |
$(TTF_DIR)/OPCODES-GENERATED $(TARGET)/TABLES-GENERATED
|