Skip to content

Commit 3e0c996

Browse files
committed
build: fix default flags for Apple clang
Change-Id: I8db9569f2da851b832e3a25fd1e757e094895761
1 parent b9792dd commit 3e0c996

2 files changed

Lines changed: 11 additions & 31 deletions

File tree

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

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -224,12 +224,13 @@ def getGeneralFlags(self, conf):
224224
['-isystem', f'{brewdir}/include'], # for Homebrew
225225
['-isystem', '/opt/local/include'], # for MacPorts
226226
]
227-
elif Utils.unversioned_sys_platform() == 'freebsd':
228-
# Bug #4790
229-
flags['CXXFLAGS'] += [['-isystem', '/usr/local/include']]
230-
if get_compiler_ver(conf) >= (18, 0, 0) and get_compiler_ver(conf) < (20, 1, 0):
231-
# Bug #5300
232-
flags['CXXFLAGS'] += ['-Wno-enum-constexpr-conversion']
227+
else:
228+
if 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']
233234
return flags
234235

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

docs/doxygen.conf.in

Lines changed: 0 additions & 23 deletions
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
@@ -2320,18 +2309,6 @@ DOT_GRAPH_MAX_NODES = 50
23202309

23212310
MAX_DOT_GRAPH_DEPTH = 0
23222311

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

0 commit comments

Comments
 (0)