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

tools.mk: report win gcc version when doing a all_sdk_versions

Browse Source
This commit is contained in:
Philippe Renon 2016-07-11 22:48:47 +02:00
parent 0a4d254a26
commit bc65e80d11
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
make/tools.mk
View File

@ -97,7 +97,7 @@ ifeq ($(UNAME), Linux)
OSG_URL := $(TOOLS_URL)/osg-3.5.3-linux-x64-qt-$(QT_VERSION).tar.gz OSG_URL := $(TOOLS_URL)/osg-3.5.3-linux-x64-qt-$(QT_VERSION).tar.gz
OSGEARTH_URL := $(TOOLS_URL)/osgearth-2.7-linux-x64-qt-$(QT_VERSION).tar.gz OSGEARTH_URL := $(TOOLS_URL)/osgearth-2.7-linux-x64-qt-$(QT_VERSION).tar.gz
else else
# x32 for linux no longer provided as pre-built binaries. # x32 for linux no longer provided as pre-built binaries.
endif endif
UNCRUSTIFY_URL := $(TOOLS_URL)/uncrustify-0.60.tar.gz UNCRUSTIFY_URL := $(TOOLS_URL)/uncrustify-0.60.tar.gz
DOXYGEN_URL := $(TOOLS_URL)/doxygen-1.8.3.1.src.tar.gz DOXYGEN_URL := $(TOOLS_URL)/doxygen-1.8.3.1.src.tar.gz
@ -121,7 +121,7 @@ else ifeq ($(UNAME), Windows)
DOXYGEN_URL := $(TOOLS_URL)/doxygen-1.8.3.1-windows.tar.bz2 DOXYGEN_URL := $(TOOLS_URL)/doxygen-1.8.3.1-windows.tar.bz2
endif endif
GTEST_URL := $(TOOLS_URL)/gtest-1.7.0.zip GTEST_URL := $(TOOLS_URL)/gtest-1.7.0.zip
CCACHE_URL := http://samba.org/ftp/ccache/ccache-3.2.2.tar.bz2 CCACHE_URL := http://samba.org/ftp/ccache/ccache-3.2.2.tar.bz2
CCACHE_MD5_URL := $(TOOLS_URL)/ccache-3.2.2.tar.bz2.md5 CCACHE_MD5_URL := $(TOOLS_URL)/ccache-3.2.2.tar.bz2.md5
@ -587,16 +587,14 @@ endif
.PHONY: mingw_version .PHONY: mingw_version
mingw_version: gcc_version mingw_version: gcc_version
else # Linux or Mac
all_sdk_version: gcc_version
endif endif
.PHONY: gcc_version .PHONY: gcc_version
gcc_version: gcc_version:
-$(V1) gcc --version | head -n1 -$(V1) gcc --version | head -n1
all_sdk_version: gcc_version
############################## ##############################
# #
# Python # Python