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

Added support for other clang on Ubuntu 12.04

Browse Source 
A Ubuntu 12.04 compatible version of clang-3.4.1 can be downloaded from
http://llvm.org/releases/3.4.1/clang+llvm-3.4.1-x86_64-unknown-ubuntu12.04.tar.xz

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
This commit is contained in:
Mark Charlebois
2015-04-20 11:00:16 -07:00
parent 672ba1a43b
commit a68f025ff9
1 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
makefiles/toolchain_native.mk
+22 -7
View File
@@ -1,5 +1,8 @@
# #
# Copyright (C) 2012-2014 PX4 Development Team. All rights reserved. # Copyright (C) 2012-2014 PX4 Development Team. All rights reuint32_tserved.
#
# 2005 Modified for clang and GCC on Linux:
# Author: Mark Charlebois <charlebm@gmail.com>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions # modification, are permitted provided that the following conditions
@@ -40,11 +43,23 @@
# 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)
HAVE_CLANG35=$(shell clang-3.6 --version) HAVE_CLANG35=$(shell clang-3.5 -dumpversion)
ifeq ($(HAVE_CLANG35),)
# Clang will report 4.2.1 as GCC version
HAVE_CLANG=$(shell clang -dumpversion)
USE_GCC=1 USE_GCC=1
else #If using ubuntu 14.04 and packaged clang 4.2.1
ifeq ($(HAVE_CLANG35),3.5)
USE_GCC=0 USE_GCC=0
CLANGVER=-3.5
else
#If using ubuntu 12.04 and downloaded clang 3.4.1
ifeq ($(HAVE_CLANG),4.2.1)
USE_GCC=0
CLANGVER=
endif
endif endif
ifeq ($(USE_GCC),1) ifeq ($(USE_GCC),1)
@@ -58,9 +73,9 @@ DEV_VER_SUPPORTED = 4.6 4.8.2
else else
# Clang options # Clang options
CC = clang-3.5 CC = clang$(CLANGVER)
CXX = clang++-3.5 CXX = clang++$(CLANGVER)
CPP = clang-3.5 -E CPP = clang$(CLANGVER) -E
# Clang GCC reported version # Clang GCC reported version
DEV_VER_SUPPORTED = 4.2.1 DEV_VER_SUPPORTED = 4.2.1