diff options
| author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2013-03-13 21:40:04 +0100 |
|---|---|---|
| committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2013-03-13 21:53:11 +0100 |
| commit | 962368571e35d86624d15bd811af01e3f11c09a5 (patch) | |
| tree | f3a8212af7e3bb71db9193eae992e77d00e46138 /tools | |
| parent | 027c035a4e4b24e64bbb4d907f143a208c68675b (diff) | |
Don't include unwarminder for checkwps, database and warble.
If the host is ARM simply checking the architecture the compiler produces
binaries for will include unwarminder even for the PC tools, breaking them.
Fixes building checkwps and database on ARM hosts. Doesn't fix warble, there
are additional problems with that.
Change-Id: I135b1103a60b9e3720117cde1075b7d73424f384
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/root.make | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tools/root.make b/tools/root.make index b62cb4d589..c2d061b0eb 100644 --- a/tools/root.make +++ b/tools/root.make @@ -71,6 +71,9 @@ ifeq (,$(findstring checkwps,$(APP_TYPE))) ifeq (,$(findstring warble,$(APP_TYPE))) include $(FIRMDIR)/firmware.make include $(ROOTDIR)/apps/bitmaps/bitmaps.make + ifeq (arch_arm,$(ARCH)) + include $(ROOTDIR)/lib/unwarminder/unwarminder.make + endif ifeq (,$(findstring bootloader,$(APPSDIR))) include $(ROOTDIR)/lib/skin_parser/skin_parser.make include $(ROOTDIR)/lib/tlsf/libtlsf.make @@ -87,10 +90,6 @@ ifndef APP_TYPE endif endif -ifeq (arch_arm,$(ARCH)) - include $(ROOTDIR)/lib/unwarminder/unwarminder.make -endif - ifneq (,$(findstring bootloader,$(APPSDIR))) include $(APPSDIR)/bootloader.make else ifneq (,$(findstring bootbox,$(APPSDIR))) |