summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Sanders <vince@netsurf-browser.org>2012-12-13 15:33:54 +0000
committerVincent Sanders <vince@netsurf-browser.org>2012-12-13 15:35:01 +0000
commit5a5451a0c58903fe5b0590e01a0f06e53c44787d (patch)
treef70082c9596085244be7a37ef0e30988b37626ba
parent25e85f1429971a13b5f063c65781a73952e0bfcf (diff)
downloadnetsurf-5a5451a0c58903fe5b0590e01a0f06e53c44787d.tar.gz
netsurf-5a5451a0c58903fe5b0590e01a0f06e53c44787d.tar.bz2
make monkey target take notice of GCCSDK_INSTALL_ENV and
GCCSDK_INSTALL_CROSSBIN environment values
-rw-r--r--Makefile17
1 files changed, 15 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 7b823acd0..9cfc4841e 100644
--- a/Makefile
+++ b/Makefile
@@ -260,8 +260,21 @@ else
endif
endif
else
- # Building for GTK, Framebuffer
- PKG_CONFIG := pkg-config
+ ifeq ($(TARGET),monkey)
+ ifeq ($(origin GCCSDK_INSTALL_ENV),undefined)
+ PKG_CONFIG := pkg-config
+ else
+ PKG_CONFIG := PKG_CONFIG_LIBDIR="$(GCCSDK_INSTALL_ENV)/lib/pkgconfig" pkg-config
+ endif
+
+ ifneq ($(origin GCCSDK_INSTALL_CROSSBIN),undefined)
+ CC := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc)
+ CXX := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*g++)
+ endif
+ else
+ # All other targets (GTK, Framebuffer)
+ PKG_CONFIG := pkg-config
+ endif
endif
endif
endif