StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add c_std and cpp_std properties." am: 220ca4d04b am: 66496c4b96

Browse Source 
am: 492a5ff3eb

Change-Id: I996cd253525cd5a70ba56432ae1d299abce7f2a4
This commit is contained in:
Dan Albert
2017-02-06 19:27:44 +00:00
committed by android-build-merger
parent a01bf0ad27 492a5ff3eb
commit 3bb28719cf
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/binary.mk
View File

@@ -394,8 +394,21 @@ else ifeq ($(my_clang),)
my_clang := true
endif
my_c_std_version := $(DEFAULT_C_STD_VERSION)
my_cpp_std_version := $(DEFAULT_CPP_STD_VERSION)
ifeq ($(LOCAL_C_STD),)
my_c_std_version := $(DEFAULT_C_STD_VERSION)
else ifeq ($(LOCAL_C_STD),experimental)
my_c_std_version := $(EXPERIMENTAL_C_STD_VERSION)
else
my_c_std_version := $(LOCAL_C_STD)
endif
ifeq ($(LOCAL_CPP_STD),)
my_cpp_std_version := $(DEFAULT_CPP_STD_VERSION)
else ifeq ($(LOCAL_CPP_STD),experimental)
my_cpp_std_version := $(EXPERIMENTAL_CPP_STD_VERSION)
else
my_cpp_std_version := $(LOCAL_CPP_STD)
endif
ifneq ($(my_clang),true)
# GCC uses an invalid C++14 ABI (emits calls to

2
core/clear_vars.mk
View File

@@ -224,6 +224,8 @@ LOCAL_VTS_INCLUDES:=
LOCAL_WARNINGS_ENABLE:=
LOCAL_WHOLE_STATIC_LIBRARIES:=
LOCAL_YACCFLAGS:=
LOCAL_C_STD:=
LOCAL_CPP_STD:=
OVERRIDE_BUILT_MODULE_PATH:=
# arch specific variables