From 166ca857fda935597a31706e635f699b0a93bc2e Mon Sep 17 00:00:00 2001 From: David Carlier Date: Mon, 30 Jul 2018 16:50:07 +0100 Subject: [PATCH] Make the build more clang friendly --- source/angelscript/include/angelscript.h | 2 +- source/linux/Makefile | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/source/angelscript/include/angelscript.h b/source/angelscript/include/angelscript.h index fea41fd..b3c4dda 100644 --- a/source/angelscript/include/angelscript.h +++ b/source/angelscript/include/angelscript.h @@ -593,7 +593,7 @@ BEGIN_AS_NAMESPACE template asUINT asGetTypeTraits() { -#if defined(_MSC_VER) || defined(_LIBCPP_TYPE_TRAITS) || (__GNUC__ >= 5) +#if defined(_MSC_VER) || defined(_LIBCPP_TYPE_TRAITS) || (__GNUC__ >= 5) || defined(__clang__) // MSVC, XCode/Clang, and gnuc 5+ // C++11 compliant code bool hasConstructor = std::is_default_constructible::value && !std::is_trivially_default_constructible::value; diff --git a/source/linux/Makefile b/source/linux/Makefile index a62b60d..2181c2e 100644 --- a/source/linux/Makefile +++ b/source/linux/Makefile @@ -35,7 +35,11 @@ else CXXFLAGS += -DNDEBUG endif ifndef NLTO +ifeq (,$(findstring g++, $(CC))) CXXFLAGS += -flto=6 +else + CXXFLAGS += -flto=thin +endif else CXXFLAGS += -fno-lto endif