aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2017-06-02 16:45:21 +0200
committerLukas Larsson <[email protected]>2017-06-02 16:45:21 +0200
commitb833a06ca54056b883b25664146707afc3a69b5b (patch)
tree4a79c0e3b3b3f02a0823975cd2e432993255d45c
parente22a5777e6deeebb55b39ac8088fd40da6102ac9 (diff)
parent6934f9779d9c81648c75721e751ef37d34fbe944 (diff)
downloadotp-b833a06ca54056b883b25664146707afc3a69b5b.tar.gz
otp-b833a06ca54056b883b25664146707afc3a69b5b.tar.bz2
otp-b833a06ca54056b883b25664146707afc3a69b5b.zip
Merge branch 'lukas/erts/hipe_mkliterals_libs/ERIERL-14/OTP-14447'
* lukas/erts/hipe_mkliterals_libs/ERIERL-14/OTP-14447: hipe: Fix hipe_mkliterals make recipe
-rw-r--r--erts/emulator/Makefile.in4
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