From 797ed78bd87c77b6fa9c3867d0fefa90bb21014c Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Tue, 5 Dec 2017 01:56:15 +0100 Subject: scripts/mk: Add new buildtools variables This adds support for AS, STRIP, OBJCOPY, OBJDUMP, NM, AR and RANLIB. Prompted-by: Helmut Grohne --- scripts/t/mk.t | 7 +++++++ scripts/t/mk/buildtools.mk | 14 ++++++++++++++ 2 files changed, 21 insertions(+) (limited to 'scripts/t') diff --git a/scripts/t/mk.t b/scripts/t/mk.t index 7eaf40cc8..0062e993c 100644 --- a/scripts/t/mk.t +++ b/scripts/t/mk.t @@ -82,6 +82,7 @@ $ENV{"TEST_$_"} = $buildflag{$_} foreach keys %buildflag; test_makefile('buildflags.mk'); my %buildtools = ( + AS => 'as', CPP => 'gcc -E', CC => 'gcc', CXX => 'g++', @@ -91,6 +92,12 @@ my %buildtools = ( F77 => 'f77', FC => 'f77', LD => 'ld', + STRIP => 'strip', + OBJCOPY => 'objcopy', + OBJDUMP => 'objdump', + NM => 'nm', + AR => 'ar', + RANLIB => 'ranlib', PKG_CONFIG => 'pkg-config', ); diff --git a/scripts/t/mk/buildtools.mk b/scripts/t/mk/buildtools.mk index 8bba96430..0077791b5 100644 --- a/scripts/t/mk/buildtools.mk +++ b/scripts/t/mk/buildtools.mk @@ -1,6 +1,8 @@ include $(srcdir)/mk/buildtools.mk test: + test "$(AS)" = "$(TEST_AS)" + test "$(AS_FOR_BUILD)" = "$(TEST_AS_FOR_BUILD)" test "$(CC)" = "$(TEST_CC)" test "$(CC_FOR_BUILD)" = "$(TEST_CC_FOR_BUILD)" test "$(CXX)" = "$(TEST_CXX)" @@ -17,5 +19,17 @@ test: test "$(FC_FOR_BUILD)" = "$(TEST_FC_FOR_BUILD)" test "$(LD)" = "$(TEST_LD)" test "$(LD_FOR_BUILD)" = "$(TEST_LD_FOR_BUILD)" + test "$(STRIP)" = "$(TEST_STRIP)" + test "$(STRIP_FOR_BUILD)" = "$(TEST_STRIP_FOR_BUILD)" + test "$(OBJCOPY)" = "$(TEST_OBJCOPY)" + test "$(OBJCOPY_FOR_BUILD)" = "$(TEST_OBJCOPY_FOR_BUILD)" + test "$(OBJDUMP)" = "$(TEST_OBJDUMP)" + test "$(OBJDUMP_FOR_BUILD)" = "$(TEST_OBJDUMP_FOR_BUILD)" + test "$(NM)" = "$(TEST_NM)" + test "$(NM_FOR_BUILD)" = "$(TEST_NM_FOR_BUILD)" + test "$(AR)" = "$(TEST_AR)" + test "$(AR_FOR_BUILD)" = "$(TEST_AR_FOR_BUILD)" + test "$(RANLIB)" = "$(TEST_RANLIB)" + test "$(RANLIB_FOR_BUILD)" = "$(TEST_RANLIB_FOR_BUILD)" test "$(PKG_CONFIG)" = "$(TEST_PKG_CONFIG)" test "$(PKG_CONFIG_FOR_BUILD)" = "$(TEST_PKG_CONFIG_FOR_BUILD)" -- cgit v1.2.3