From 07655aaba1d89d003fe0841b8b6c763be4be495a Mon Sep 17 00:00:00 2001 From: Markham Date: Wed, 11 Nov 2015 16:06:43 +0100 Subject: [PATCH] update environment.mk --- make/environment.mk | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/make/environment.mk b/make/environment.mk index 0cf24c5..032ef0d 100755 --- a/make/environment.mk +++ b/make/environment.mk @@ -43,18 +43,14 @@ endif BOXARCH = arm -TARGET_NEVIS = arm-cx2450x-linux-gnueabi -TARGET_APOLLO = arm-pnx8400-linux-uclibcgnueabi -TARGET_KRONOS = arm-pnx8400-linux-uclibcgnueabi - ifeq ($(PLATFORM), nevis) - TARGET = $(TARGET_NEVIS) + TARGET ?= arm-cx2450x-linux-gnueabi endif ifeq ($(PLATFORM), apollo) - TARGET = $(TARGET_APOLLO) + TARGET ?= arm-pnx8400-linux-uclibcgnueabi endif ifeq ($(PLATFORM), kronos) - TARGET = $(TARGET_KRONOS) + TARGET ?= arm-pnx8400-linux-uclibcgnueabi endif TARGETLIB = $(TARGETPREFIX)/lib @@ -67,9 +63,10 @@ LD_FLAGS = $(TARGET_LDFLAGS) VPATH = $(D) PATH := $(HOSTPREFIX)/bin:$(CROSS_DIR)/bin:$(PATH) -PKG_CONFIG = /usr/bin/pkg-config +#PKG_CONFIG = /usr/bin/pkg-config +PKG_CONFIG = $(HOSTPREFIX)/bin/$(TARGET)-pkg-config PKG_CONFIG_LIBDIR = $(TARGETPREFIX)/lib -PKG_CONFIG_PATH = $(TARGETPREFIX)/lib/pkgconfig +PKG_CONFIG_PATH = $(PKG_CONFIG_LIBDIR)/pkgconfig # helper-"functions": REWRITE_LIBTOOL = sed -i "s,^libdir=.*,libdir='$(TARGETLIB)'," $(TARGETLIB) -- 2.39.5