Skip to content

Commit 63e0a07

Browse files
committed
build: fix default flags for Apple clang
Change-Id: If52fc93cd5d54b8d0beae955cf7de6733fb48f89
1 parent 187e065 commit 63e0a07

File tree

2 files changed

+11
-31
lines changed

2 files changed

+11
-31
lines changed

.waf-tools/default-compiler-flags.py

+11-8
Original file line numberDiff line numberDiff line change
@@ -225,12 +225,13 @@ def getGeneralFlags(self, conf):
225225
['-isystem', f'{brewdir}/include'], # for Homebrew
226226
['-isystem', '/opt/local/include'], # for MacPorts
227227
]
228-
elif Utils.unversioned_sys_platform() == 'freebsd':
229-
# Bug #4790
230-
flags['CXXFLAGS'] += [['-isystem', '/usr/local/include']]
231-
if get_compiler_ver(conf) >= (18, 0, 0) and get_compiler_ver(conf) < (20, 1, 0):
232-
# Bug #5300
233-
flags['CXXFLAGS'] += ['-Wno-enum-constexpr-conversion']
228+
else:
229+
if Utils.unversioned_sys_platform() == 'freebsd':
230+
# Bug #4790
231+
flags['CXXFLAGS'] += [['-isystem', '/usr/local/include']]
232+
if get_compiler_ver(conf) >= (18, 0, 0) and get_compiler_ver(conf) < (20, 1, 0):
233+
# Bug #5300
234+
flags['CXXFLAGS'] += ['-Wno-enum-constexpr-conversion']
234235
return flags
235236

236237
__cxxFlags = [
@@ -241,11 +242,13 @@ def getGeneralFlags(self, conf):
241242
def getDebugFlags(self, conf):
242243
flags = super().getDebugFlags(conf)
243244
flags['CXXFLAGS'] += self.__cxxFlags
245+
ccver = get_compiler_ver(conf)
246+
darwin = Utils.unversioned_sys_platform() == 'darwin'
244247
# Enable assertions in libc++
245-
if get_compiler_ver(conf) >= (18, 0, 0):
248+
if (darwin and ccver >= (17, 0, 0)) or (not darwin and ccver >= (18, 0, 0)):
246249
# https://libcxx.llvm.org/Hardening.html
247250
flags['DEFINES'] += ['_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE']
248-
elif get_compiler_ver(conf) >= (15, 0, 0):
251+
elif ccver >= (15, 0, 0):
249252
# https://releases.llvm.org/15.0.0/projects/libcxx/docs/UsingLibcxx.html#enabling-the-safe-libc-mode
250253
flags['DEFINES'] += ['_LIBCPP_ENABLE_ASSERTIONS=1']
251254
# Tell libc++ to avoid including transitive headers

docs/doxygen.conf.in

-23
Original file line numberDiff line numberDiff line change
@@ -1441,17 +1441,6 @@ EXT_LINKS_IN_WINDOW = NO
14411441

14421442
FORMULA_FONTSIZE = 10
14431443

1444-
# Use the FORMULA_TRANPARENT tag to determine whether or not the images
1445-
# generated for formulas are transparent PNGs. Transparent PNGs are not
1446-
# supported properly for IE 6.0, but are supported on all modern browsers.
1447-
#
1448-
# Note that when changing this option you need to delete any form_*.png files in
1449-
# the HTML output directory before the changes have effect.
1450-
# The default value is: YES.
1451-
# This tag requires that the tag GENERATE_HTML is set to YES.
1452-
1453-
FORMULA_TRANSPARENT = YES
1454-
14551444
# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
14561445
# http://www.mathjax.org) which uses client side Javascript for the rendering
14571446
# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
@@ -2317,18 +2306,6 @@ DOT_GRAPH_MAX_NODES = 50
23172306

23182307
MAX_DOT_GRAPH_DEPTH = 0
23192308

2320-
# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
2321-
# background. This is disabled by default, because dot on Windows does not seem
2322-
# to support this out of the box.
2323-
#
2324-
# Warning: Depending on the platform used, enabling this option may lead to
2325-
# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
2326-
# read).
2327-
# The default value is: NO.
2328-
# This tag requires that the tag HAVE_DOT is set to YES.
2329-
2330-
DOT_TRANSPARENT = YES
2331-
23322309
# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
23332310
# files in one run (i.e. multiple -o and -T options on the command line). This
23342311
# makes dot run faster, but since only newer versions of dot (>1.8.10) support

0 commit comments

Comments
 (0)