Update: Make build settings more consistent across multiple projects.

diff --git a/data/build/settings b/data/build/settings
index 87dcb26ed9ad6708b259938f7159d7ab1534abe9..3c5baa0908552dc2bf6cb48a2ac7c30dd8838d86 100644 (file)
--- a/data/build/settings
+++ b/data/build/settings
@@ -73,6 +73,7 @@ environment LANG LC_ALL LC_COLLATE LC_CTYPE LC_FASTMSG LC_MESSAGES LC_MONETARY L
 #defines -D_di_libcap_
 defines -D_libcap_legacy_only_
 defines-android -D_di_f_thread_attribute_affinity_get_ -D_di_f_thread_attribute_affinity_set_ -D_di_f_thread_attribute_concurrency_get_ -D_di_f_thread_attribute_concurrency_set_ -D_di_f_thread_attribute_default_get_ -D_di_f_thread_attribute_default_set_ -D_di_f_thread_cancel_ -D_di_f_thread_cancel_state_set_ -D_di_f_thread_cancel_test_ -D_di_f_thread_join_try_ -D_di_f_thread_join_timed_ -D_pthread_mutex_prioceiling_unsupported_ -D_di_f_thread_semaphore_file_close_ -D_di_f_thread_semaphore_file_open_ -D_di_f_thread_semaphore_file_delete_ -D_di_f_thread_cancel_type_set_
+defines-clang -D_clang_not_a_compile_time_constant_workaround_
 defines-debug -D_en_f_status_debug_
 defines-thread -D_pthread_attr_unsupported_ -D_pthread_sigqueue_unsupported_
 defines-threadless -D_di_thread_support_

diff --git a/data/build/settings.control b/data/build/settings.control
index 20bd2e8d634d36c48338ac62925b658db0c8eff5..81f5b14d3c5a4f97dd00615f2d22ef6888e6767c 100644 (file)
--- a/data/build/settings.control
+++ b/data/build/settings.control
@@ -73,6 +73,7 @@ environment LANG LC_ALL LC_COLLATE LC_CTYPE LC_FASTMSG LC_MESSAGES LC_MONETARY L
 #defines -D_di_libcap_
 defines -D_libcap_legacy_only_
 defines-android -D_di_f_thread_attribute_affinity_get_ -D_di_f_thread_attribute_affinity_set_ -D_di_f_thread_attribute_concurrency_get_ -D_di_f_thread_attribute_concurrency_set_ -D_di_f_thread_attribute_default_get_ -D_di_f_thread_attribute_default_set_ -D_di_f_thread_cancel_ -D_di_f_thread_cancel_state_set_ -D_di_f_thread_cancel_test_ -D_di_f_thread_join_try_ -D_di_f_thread_join_timed_ -D_pthread_mutex_prioceiling_unsupported_ -D_di_f_thread_semaphore_file_close_ -D_di_f_thread_semaphore_file_open_ -D_di_f_thread_semaphore_file_delete_ -D_di_f_thread_cancel_type_set_
+defines-clang -D_clang_not_a_compile_time_constant_workaround_
 defines-debug -D_en_f_status_debug_
 defines-thread -D_pthread_attr_unsupported_ -D_pthread_sigqueue_unsupported_
 defines-threadless -D_di_thread_support_

diff --git a/data/build/stand_alone/settings.control b/data/build/stand_alone/settings.control
index b8d86368fb17512dfdfea928107f7390c9df3288..09f9f95be3af0bea72b969e40ee4df21530be6f6 100644 (file)
--- a/data/build/stand_alone/settings.control
+++ b/data/build/stand_alone/settings.control
@@ -104,6 +104,7 @@ defines -include sources/c/config.h -I sources/c/
 #defines -D_di_libcap_
 defines -D_libcap_legacy_only_
 defines-android -D_di_f_thread_attribute_affinity_get_ -D_di_f_thread_attribute_affinity_set_ -D_di_f_thread_attribute_concurrency_get_ -D_di_f_thread_attribute_concurrency_set_ -D_di_f_thread_attribute_default_get_ -D_di_f_thread_attribute_default_set_ -D_di_f_thread_cancel_ -D_di_f_thread_cancel_state_set_ -D_di_f_thread_cancel_test_ -D_di_f_thread_join_try_ -D_di_f_thread_join_timed_ -D_pthread_mutex_prioceiling_unsupported_ -D_di_f_thread_semaphore_file_close_ -D_di_f_thread_semaphore_file_open_ -D_di_f_thread_semaphore_file_delete_ -D_di_f_thread_cancel_type_set_
+defines-clang -D_clang_not_a_compile_time_constant_workaround_
 defines-debug -D_en_f_status_debug_
 defines-thread -D_pthread_attr_unsupported_ -D_pthread_sigqueue_unsupported_
 defines-threadless -D_di_thread_support_