rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-17 02:52:12 +01:00
Code Issues Releases Activity

makefile: define ARCH before including make/tools.mk

Browse Source 
ARCH is required in order to pick up the right versions
of the tools for each architecture.
This commit is contained in:
Stacey Sheldon 2012-12-16 00:18:07 -05:00 committed by Alessio Morale
parent f934ebfd4c
commit e00372a540
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -58,14 +58,17 @@ export V1 := $(AT)
else ifeq ($(V), 1)
endif
# Make sure we know a few things about the architecture before including
# the tools.mk to ensure that we download/install the right tools.
UNAME := $(shell uname)
ARCH := $(shell uname -m)
include $(ROOT_DIR)/make/tools.mk
# We almost need to consider autoconf/automake instead of this
# I don't know if windows supports uname :-(
QT_SPEC=win32-g++
UAVOBJGENERATOR="$(BUILD_DIR)/ground/uavobjgenerator/debug/uavobjgenerator.exe"
UNAME := $(shell uname)
ARCH := $(shell uname -m)
ifeq ($(UNAME), Linux)
QT_SPEC=linux-g++
UAVOBJGENERATOR="$(BUILD_DIR)/ground/uavobjgenerator/uavobjgenerator"