Skip to content

Commit 838d322

Browse files
Artem Panfilovabrodkin
authored andcommitted
release.mk: add tcf handler installation
Previously tcf handler was installed with internal verification scripts. Now it's done explicit way with release.mk. Also, add a proper installation name for the tcf tool. Signed-off-by: Artem Panfilov <[email protected]>
1 parent 39f1f02 commit 838d322

File tree

1 file changed

+18
-14
lines changed

1 file changed

+18
-14
lines changed

release.mk

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -615,37 +615,41 @@ define copy_pdf_doc_file
615615
endef
616616
endif
617617

618-
# Copy linux tcftool version into workspace
619-
# $1 - destination directory.
618+
# Copy tcf handler and linux tcftool version into the workspace
619+
# $1 - arch prefix.
620+
# $2 - destination directory.
620621
ifeq ($(ENABLE_TCF_TOOLS),y)
621-
define copy_tcftool_linux
622-
$(INSTALL) -m 0775 $(EXTRAS_DIR)/tcftool/tcftool_x86_linux $(1)/bin
622+
define copy_tcf_linux
623+
$(INSTALL) -m 0775 $(EXTRAS_DIR)/arc-tcf-gcc $O/$(2)/bin/$(1)-elf32-tcf-gcc
624+
$(INSTALL) -m 0775 $(EXTRAS_DIR)/tcftool/tcftool_x86_linux $O/$(2)/bin/tcftool
623625
endef
624626
else
625-
define copy_tcftool_linux
627+
define copy_tcf_linux
626628
endef
627629
endif
628630

629-
# Copy windows tcftool version into workspace
630-
# $1 - destination directory.
631+
# Copy tcf handler and windows tcftool version into the workspace
632+
# $1 - arch prefix.
633+
# $2 - destination directory.
631634
ifeq ($(ENABLE_TCF_TOOLS),y)
632-
define copy_tcftool_win
633-
$(INSTALL) -m 0775 $(EXTRAS_DIR)/tcftool/tcftool_x86_windows.exe $(1)/bin
635+
define copy_tcf_win
636+
$(INSTALL) -m 0775 $(EXTRAS_DIR)/arc-tcf-gcc $O/$(2)/bin/$(1)-elf32-tcf-gcc
637+
$(INSTALL) -m 0775 $(EXTRAS_DIR)/tcftool/tcftool_x86_windows.exe $O/$(2)/bin/tcftool.exe
634638
endef
635639
else
636-
define copy_tcftool_win
640+
define copy_tcf_win
637641
endef
638642
endif
639643

640644
$O/.stamp_elf_le_built: $(TOOLS_ALL_DEPS-y) | $(TOOLS_ALL_ORDER_DEPS-y)
641645
$(call copy_prebuilt,arc-multilib-elf32,$(TOOLS_ELFLE_HOST_DIR))
642-
$(call copy_tcftool_linux,$O/$(TOOLS_ELFLE_HOST_DIR))
646+
$(call copy_tcf_linux,arc,$(TOOLS_ELFLE_HOST_DIR))
643647
$(call copy_pdf_doc_file,$O/$(TOOLS_ELFLE_HOST_DIR))
644648
touch $@
645649

646650
$O/.stamp_elf_be_built: $(TOOLS_ALL_DEPS-y) | $(TOOLS_ALL_ORDER_DEPS-y)
647651
$(call copy_prebuilt,arceb-multilib-elf32,$(TOOLS_ELFBE_HOST_DIR))
648-
$(call copy_tcftool_linux,$O/$(TOOLS_ELFBE_HOST_DIR))
652+
$(call copy_tcf_linux,arceb,$(TOOLS_ELFBE_HOST_DIR))
649653
$(call copy_pdf_doc_file,$O/$(TOOLS_ELFBE_HOST_DIR))
650654
touch $@
651655

@@ -773,13 +777,13 @@ endif
773777

774778
$O/.stamp_elf_le_windows_built: $(TOOLS_ALL_DEPS-y) | $(TOOLS_ALL_ORDER_DEPS-y)
775779
$(call copy_prebuilt,arc-elf32-win,$(TOOLS_ELFLE_WIN_DIR))
776-
$(call copy_tcftool_win,$O/$(TOOLS_ELFLE_WIN_DIR))
780+
$(call copy_tcf_win,arc,$(TOOLS_ELFLE_WIN_DIR))
777781
$(call copy_pdf_doc_file,$O/$(TOOLS_ELFLE_WIN_DIR))
778782
touch $@
779783

780784
$O/.stamp_elf_be_windows_built: $(TOOLS_ALL_DEPS-y) | $(TOOLS_ALL_ORDER_DEPS-y)
781785
$(call copy_prebuilt,arceb-elf32-win,$(TOOLS_ELFBE_WIN_DIR))
782-
$(call copy_tcftool_win,$O/$(TOOLS_ELFBE_WIN_DIR))
786+
$(call copy_tcf_win,arceb,$(TOOLS_ELFBE_WIN_DIR))
783787
$(call copy_pdf_doc_file,$O/$(TOOLS_ELFBE_WIN_DIR))
784788
touch $@
785789

0 commit comments

Comments
 (0)