Commit caa329bf authored by Samuel Martin's avatar Samuel Martin Committed by Thomas Petazzoni
Browse files

Makefile: introduce BR_PATH 



Since the HOST_PATH and TARGET_PATH variables almost contain the same
things, let's factorize this in a single BR_PATH.

Signed-off-by: default avatarSamuel Martin <s.martin49@gmail.com>
Reviewed-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent f98721c2

Makefile

+3 −0
Original line number Diff line number Diff line
@@ -330,6 +330,9 @@ TAR_OPTIONS=$(call qstrip,$(BR2_TAR_OPTIONS)) -xf 
# packages compiled for the host go here

HOST_DIR:=$(call qstrip,$(BR2_HOST_DIR))



# Quotes are needed for spaces and all in the original PATH content.

BR_PATH = "$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(HOST_DIR)/usr/sbin:$(PATH)"



# locales to generate

GENERATE_LOCALE=$(call qstrip,$(BR2_GENERATE_LOCALE))

package/Makefile.in

+2 −3
Original line number Diff line number Diff line
@@ -168,8 +168,7 @@ else 
TARGET_CROSS=$(HOST_DIR)/usr/bin/$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX))-

endif



# Quotes are needed for spaces et al in path components.

TARGET_PATH="$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(HOST_DIR)/usr/sbin/:$(PATH)"

TARGET_PATH = $(BR_PATH)



# Define TARGET_xx variables for all common binutils/gcc

TARGET_AR       = $(TARGET_CROSS)ar
@@ -224,7 +223,7 @@ HOST_CFLAGS ?= -O2 
HOST_CFLAGS   += $(HOST_CPPFLAGS)

HOST_CXXFLAGS += $(HOST_CFLAGS)

HOST_LDFLAGS  += -L$(HOST_DIR)/lib -L$(HOST_DIR)/usr/lib -Wl,-rpath,$(HOST_DIR)/usr/lib

HOST_PATH=$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(PATH)

HOST_PATH = $(BR_PATH)



# hostcc version as an integer - E.G. 4.3.2 => 432

HOSTCC_VERSION:=$(shell $(HOSTCC_NOCCACHE) --version | \