diff options
| author | Sverker Eriksson <[email protected]> | 2016-11-09 16:52:23 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-11-11 15:59:16 +0100 |
| commit | 5aa13e16ae81050509fceaf603650fc8594af7ec (patch) | |
| tree | 0a172d6d624b34011cd3d4f63d762333d3656eb1 | |
| parent | e6059f94571a6c968c15b9de6b7d63ebd64f9acf (diff) | |
| download | otp-5aa13e16ae81050509fceaf603650fc8594af7ec.tar.gz otp-5aa13e16ae81050509fceaf603650fc8594af7ec.tar.bz2 otp-5aa13e16ae81050509fceaf603650fc8594af7ec.zip | |
erts: Fix correct link flags for hipe_mkliterals
and no need for $(INCLUDED).
| -rw-r--r-- | erts/emulator/Makefile.in | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in index e0260205e3..8772befe27 100644 --- a/erts/emulator/Makefile.in +++ b/erts/emulator/Makefile.in @@ -49,6 +49,7 @@ CREATE_DIRS= LDFLAGS=@LDFLAGS@ ARFLAGS=rc OMIT_OMIT_FP=no +TYPE_LIBS= DIRTY_SCHEDULER_SUPPORT=@DIRTY_SCHEDULER_SUPPORT@ NEW_PURGE_STRATEGY=@NEW_PURGE_STRATEGY@ @@ -90,7 +91,7 @@ PURIFY = TYPEMARKER = .gcov TYPE_FLAGS = $(DEBUG_CFLAGS) -DERTS_GCOV -DNO_JUMP_TABLE -fprofile-arcs -ftest-coverage -O0 -DERTS_CAN_INLINE=0 -DERTS_INLINE= ifneq ($(findstring solaris,$(TARGET)),solaris) -LIBS += -lgcov +TYPE_LIBS = -lgcov endif ENABLE_ALLOC_TYPE_VARS += debug else @@ -146,6 +147,8 @@ endif endif endif +LIBS += $(TYPE_LIBS) + comma:=, space:= space+= @@ -931,7 +934,7 @@ $(OBJDIR)/%.o: hipe/%.c $(V_CC) $(subst O2,O3, $(CFLAGS)) $(INCLUDES) -c $< -o $@ $(BINDIR)/hipe_mkliterals$(TF_MARKER): $(OBJDIR)/hipe_mkliterals.o - $(ld_verbose)$(CC) $(CFLAGS) $(INCLUDES) -o $@ $< + $(ld_verbose)$(CC) $(LDFLAGS) -o $@ $< $(TYPE_LIBS) $(OBJDIR)/hipe_mkliterals.o: $(HIPE_ASM) $(TTF_DIR)/erl_alloc_types.h $(DTRACE_HEADERS) \ $(TTF_DIR)/OPCODES-GENERATED $(TARGET)/TABLES-GENERATED |