From bc65e80d115b96eb84b457bd9920213e45c61e8f Mon Sep 17 00:00:00 2001 From: Philippe Renon Date: Mon, 11 Jul 2016 22:48:47 +0200 Subject: [PATCH] tools.mk: report win gcc version when doing a all_sdk_versions --- make/tools.mk | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/make/tools.mk b/make/tools.mk index 4e641de5a..15ab8ff4f 100644 --- a/make/tools.mk +++ b/make/tools.mk @@ -97,7 +97,7 @@ ifeq ($(UNAME), Linux) 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 else - # x32 for linux no longer provided as pre-built binaries. + # x32 for linux no longer provided as pre-built binaries. endif UNCRUSTIFY_URL := $(TOOLS_URL)/uncrustify-0.60.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 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_MD5_URL := $(TOOLS_URL)/ccache-3.2.2.tar.bz2.md5 @@ -587,16 +587,14 @@ endif .PHONY: mingw_version mingw_version: gcc_version -else # Linux or Mac - -all_sdk_version: gcc_version - endif .PHONY: gcc_version gcc_version: -$(V1) gcc --version | head -n1 +all_sdk_version: gcc_version + ############################## # # Python