diff options
| author | Lukas Larsson <[email protected]> | 2017-05-22 12:29:17 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2017-05-29 14:51:02 +0200 |
| commit | 6934f9779d9c81648c75721e751ef37d34fbe944 (patch) | |
| tree | d6bfb9f3ce73654821a31b9fb06d8bf0a395bfae /erts | |
| parent | 05dce0f330c83278cb134c7235a5353ce4116307 (diff) | |
| download | otp-6934f9779d9c81648c75721e751ef37d34fbe944.tar.gz otp-6934f9779d9c81648c75721e751ef37d34fbe944.tar.bz2 otp-6934f9779d9c81648c75721e751ef37d34fbe944.zip | |
hipe: Fix hipe_mkliterals make recipe
If a link dependency is added in LDFLAGS it should be resolved
in LIBS, so we have to use LIBS and not TYPE_LIBS.
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/Makefile.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in index 254e59f2c7..61c1e14741 100644 --- a/erts/emulator/Makefile.in +++ b/erts/emulator/Makefile.in @@ -149,6 +149,8 @@ endif LIBS += $(TYPE_LIBS) +ORIG_LIBS:= $(LIBS) + comma:=, space:= space+= @@ -965,7 +967,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) $(LDFLAGS) -o $@ $< $(TYPE_LIBS) + $(ld_verbose)$(CC) $(LDFLAGS) -o $@ $< $(ORIG_LIBS) $(OBJDIR)/hipe_mkliterals.o: $(HIPE_ASM) $(TTF_DIR)/erl_alloc_types.h $(DTRACE_HEADERS) \ $(TTF_DIR)/OPCODES-GENERATED $(TTF_DIR)/TABLES-GENERATED |