OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Correct makefiles to build linenoise correctly

This commit is contained in:
Zack Corr 2012-10-27 21:16:26 +10:00
parent c97c8131a5
commit 9ed8ce3364
3 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.in
View File

@ -337,7 +337,8 @@ HSREQ$(1)_H_$(3) = \
TSREQ$(1)_T_$(2)_H_$(3) = \
$$(HSREQ$(1)_H_$(3)) \
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_RUNTIME) \
$$(TLIB$(1)_T_$(2)_H_$(3))/libmorestack.a
$$(TLIB$(1)_T_$(2)_H_$(3))/libmorestack.a \
$$(TLIB$(1)_T_$(2)_H_$(3))/liblinenoise.a
# Prerequisites for complete stageN targets
SREQ$(1)_T_$(2)_H_$(3) = \
@ -491,6 +492,7 @@ include $(CFG_SRC_DIR)mk/host.mk
include $(CFG_SRC_DIR)mk/stage0.mk
include $(CFG_SRC_DIR)mk/rt.mk
include $(CFG_SRC_DIR)mk/rustllvm.mk
include $(CFG_SRC_DIR)mk/linenoise.mk
include $(CFG_SRC_DIR)mk/tools.mk
include $(CFG_SRC_DIR)mk/docs.mk
include $(CFG_SRC_DIR)mk/llvm.mk

23
mk/linenoise.mk Normal file
View File

@ -0,0 +1,23 @@
######################################################################
# linenoise - minimalistic readline alternative used by the REPL
######################################################################
define DEF_LINENOISE_TARGETS
LINENOISE_CS_$(1) := $$(addprefix linenoise/, linenoise.c)
LINENOISE_OBJS_$(1) := $(LINENOISE_CS_$(1):linenoise/%.c=linenoise/$(1)/%.o)
ALL_OBJ_FILES += $$(LINENOISE_OBJS_$(1))
linenoise/$(1)/liblinenoise.a: $$(LINENOISE_OBJS_$(1))
@$$(call E, link: $$@)
$$(Q)ar rcs $$@ $$<
linenoise/$(1)/%.o: linenoise/%.c $$(MKFILE_DEPS)
@$$(call E, compile: $$@)
$$(Q)$$(call CFG_COMPILE_C_$(1), $$@,) $$<
endef
# Instantiate template for all stages
$(foreach target,$(CFG_TARGET_TRIPLES), \
$(eval $(call DEF_LINENOISE_TARGETS,$(target))))

11
mk/target.mk
View File

@ -12,17 +12,6 @@ USE_SNAPSHOT_RUNTIME=0
USE_SNAPSHOT_CORELIB=0
USE_SNAPSHOT_STDLIB=0
LINENOISE_OBJS_$(2) := linenoise/$(2)/linenoise.o
ALL_OBJ_FILES += $$(LINENOISE_OBJS_$(2))
linenoise/$(2)/linenoise.o: linenoise/linenoise.c $$(MKFILE_DEPS)
@$$(call E, compile: $$@)
$$(Q)$$(call CFG_COMPILE_C_$(2), $$@,) $$<
linenoise/$(2)/liblinenoise.a: $$(LINENOISE_OBJS_$(2))
@$$(call E, link: $$@)
$$(Q)ar rcs $$@ $$<
define TARGET_STAGE_N
$$(TLIB$(1)_T_$(2)_H_$(3))/libmorestack.a: \