From f1f4451aa78b724edb8a75bc9b03b00958ded94f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 11 Nov 2013 17:47:26 +0100 Subject: [PATCH] package: add objcopy and ranlib to HOST_CONFIGURE_OPTS This commit adds the OBJCOPY and RANLIB variables to HOST_CONFIGURE_OPTS, since grub legacy will need these defined in order to build properly. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- Makefile | 8 ++++++++ package/Makefile.in | 2 ++ 2 files changed, 10 insertions(+) diff --git a/Makefile b/Makefile index 8c2429ad0d..6c28a86990 100644 --- a/Makefile +++ b/Makefile @@ -189,6 +189,12 @@ endif ifndef HOSTNM HOSTNM:=nm endif +ifndef HOSTOBJCOPY +HOSTOBJCOPY:=objcopy +endif +ifndef HOSTRANLIB +HOSTRANLIB:=ranlib +endif HOSTAR:=$(shell which $(HOSTAR) || type -p $(HOSTAR) || echo ar) HOSTAS:=$(shell which $(HOSTAS) || type -p $(HOSTAS) || echo as) HOSTFC:=$(shell which $(HOSTLD) || type -p $(HOSTLD) || echo || which g77 || type -p g77 || echo gfortran) @@ -196,6 +202,8 @@ HOSTCPP:=$(shell which $(HOSTCPP) || type -p $(HOSTCPP) || echo cpp) HOSTLD:=$(shell which $(HOSTLD) || type -p $(HOSTLD) || echo ld) HOSTLN:=$(shell which $(HOSTLN) || type -p $(HOSTLN) || echo ln) HOSTNM:=$(shell which $(HOSTNM) || type -p $(HOSTNM) || echo nm) +HOSTOBJCOPY:=$(shell which $(HOSTOBJCOPY) || type -p $(HOSTOBJCOPY) || echo objcopy) +HOSTRANLIB:=$(shell which $(HOSTRANLIB) || type -p $(HOSTRANLIB) || echo ranlib) export HOSTAR HOSTAS HOSTCC HOSTCXX HOSTFC HOSTLD export HOSTCC_NOCCACHE HOSTCXX_NOCCACHE diff --git a/package/Makefile.in b/package/Makefile.in index 5d52fbd97d..7bc06065ac 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -256,6 +256,8 @@ HOST_CONFIGURE_OPTS=PATH=$(HOST_PATH) \ GCC="$(HOSTCC)" \ CXX="$(HOSTCXX)" \ CPP="$(HOSTCPP)" \ + OBJCOPY="$(HOSTOBJCOPY)" \ + RANLIB="$(HOSTRANLIB)" \ CPPFLAGS="$(HOST_CPPFLAGS)" \ CFLAGS="$(HOST_CFLAGS)" \ CXXFLAGS="$(HOST_CXXFLAGS)" \ -- 2.30.2