diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2010-01-24 11:39:35 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2010-01-24 11:39:35 +0000 |
| commit | 6fe7fa0c1a9d8a94b370c0f9c1ab6d5d9853f062 (patch) | |
| tree | 5a1a9ac27092f60d20823656e843e2fc6ac3e0c9 /makefiles/Makefile.tools | |
| parent | 36b2fbfd92f4b1ae7a457128ae09b38d5ba149ac (diff) | |
| download | buildsystem-6fe7fa0c1a9d8a94b370c0f9c1ab6d5d9853f062.tar.gz buildsystem-6fe7fa0c1a9d8a94b370c0f9c1ab6d5d9853f062.tar.bz2 | |
Fix toolchain discovery.
Remove need for pkg-config wrapper script
svn path=/trunk/tools/buildsystem/; revision=9881
Diffstat (limited to 'makefiles/Makefile.tools')
| -rw-r--r-- | makefiles/Makefile.tools | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/makefiles/Makefile.tools b/makefiles/Makefile.tools index 7b5190d..0d9ab2f 100644 --- a/makefiles/Makefile.tools +++ b/makefiles/Makefile.tools @@ -158,12 +158,11 @@ ifeq ($(TARGET),beos) BEOS_INSTALL_ENV ?= /home/jmb/haiku/env BEOS_INSTALL_CROSSBIN ?= /home/jmb/haiku/haiku/generated/cross-tools/bin - CC__ := $(wildcard BEOS_INSTALL_CROSSBIN/*gcc) - CXX__ := $(wildcard BEOS_INSTALL_CROSSBIN/*g++) - AR__ := $(wildcard BEOS_INSTALL_CROSSBIN/*ar) + CC__ := $(wildcard $(BEOS_INSTALL_CROSSBIN)/*gcc) + CXX__ := $(wildcard $(BEOS_INSTALL_CROSSBIN)/*g++) + AR__ := $(wildcard $(BEOS_INSTALL_CROSSBIN)/*ar) - # TODO: can we avoid the need for this by setting PKG_CONFIG_LIBDIR here? - PKGCONFIG := $(BEOS_INSTALL_ENV)/bin/beos-pkg-config + PKGCONFIG := PKG_CONFIG_LIBDIR="$(BEOS_INSTALL_ENV)/lib/pkgconfig:$(BEOS_INSTALL_ENV)/share/pkgconfig" pkg-config endif endif |