fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-06 06:31:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Linux: Default to use clang

Browse Source 
Fixed to use clang 3.4.2 on Ubuntu 12.04

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
This commit is contained in:
Mark Charlebois
2015-04-20 11:35:49 -07:00
parent 639afeb28f
commit a1501fa368
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
makefiles/toolchain_native.mk
+4 -4
View File
@@ -42,7 +42,7 @@
# #
# Set to 1 for GCC-4.8.2 and to 0 for Clang-3.5 (Ubuntu 14.04) # Set to 1 for GCC-4.8.2 and to 0 for Clang-3.5 (Ubuntu 14.04)
USE_GCC?=1 USE_GCC?=0
ifneq ($(USE_GCC),1) ifneq ($(USE_GCC),1)
@@ -51,13 +51,13 @@ HAVE_CLANG35=$(shell clang-3.5 -dumpversion)
# Clang will report 4.2.1 as GCC version # Clang will report 4.2.1 as GCC version
HAVE_CLANG=$(shell clang -dumpversion) HAVE_CLANG=$(shell clang -dumpversion)
#If using ubuntu 14.04 and packaged clang 4.2.1 #If using ubuntu 14.04 and packaged clang 3.5
ifeq ($(HAVE_CLANG35),4.2.1) ifeq ($(HAVE_CLANG35),4.2.1)
USE_GCC=0 USE_GCC=0
CLANGVER=-3.5 CLANGVER=-3.5
else else
#If using ubuntu 12.04 and downloaded clang 3.4.1 #If using ubuntu 12.04 and downloaded clang 3.4.2
ifeq ($(HAVE_CLANG),4.2.1) ifeq ($(HAVE_CLANG),4.2.1)
USE_GCC=0 USE_GCC=0
CLANGVER= CLANGVER=
@@ -66,7 +66,7 @@ endif
# If no version of clang was found # If no version of clang was found
ifeq ($(HAVE_CLANG35),) ifeq ($(HAVE_CLANG35),)
ifeq ($(HAVE_CLANG35),) ifeq ($(HAVE_CLANG),)
$(error Clang not found. Try make USE_GCC=1) $(error Clang not found. Try make USE_GCC=1)
endif endif
endif endif