Changeset 71b4444 in mainline for meson/part

Timestamp:

2023-10-22T16:59:42Z (2 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

master, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

78f0422c, dd7df1c

Parents:

590cb6d2 (diff), 2944b5a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge meson script updates for new toolchain

Location:

meson/part

Files:

• compiler_args/meson.build (modified) (2 diffs)
• tools/meson.build (modified) (1 diff)

meson/part/compiler_args/meson.build

@@ -110 +110 @@
 extra_cppflags = extra_common_flags + [
         '-fno-exceptions',
+        '-Wno-misleading-indentation',
         '-frtti',
 ]
@@ -128 +129 @@
         add_project_link_arguments(extra_cflags, language : [ lang ])
 endforeach
+
+# This flag is needed at several places, hence we define it here.
+#
+# For backwards compatibility we try to detect --no-warn-rwx-segments.
+# However, the autodetection done by Meson also results in
+# "cannot find entry symbol _start; defaulting to 00000000004000b0"
+# thus the option is never supported alone. So when detecting we also
+# specify --entry=main so that the stub source provided by Meson is build
+# correctly.
+ldflags_ignore_rwx_segments = []
+if cc.has_link_argument('-Wl,--no-warn-rwx-segments,--entry=main')
+    ldflags_ignore_rwx_segments += ['-Wl,--no-warn-rwx-segments']
+endif

meson/part/tools/meson.build

@@ -61 +61 @@
 endif
 
+# On some distributions (e.g. Arch Linux), genisoimage is actually a symbolic
+# link to mkisofs. However, they do not accept exactly the same options.
+# Thus we check if genisoimage is a symbolic link to mkisofs and if it is so,
+# we switch to mkisofs as that is the native application available.
+fs = import('fs')
 genisoimage = find_program('genisoimage', required: false)
-if genisoimage.found()
+_mkisofs = find_program('mkisofs', required: false)
+if genisoimage.found() and not (fs.is_symlink(genisoimage.full_path()) and _mkisofs.found() and fs.is_samepath(genisoimage.full_path(), _mkisofs.full_path()))
         genisoimage_type = 'genisoimage'
 else
-        genisoimage = find_program('mkisofs', required: false)
+        genisoimage = _mkisofs
         if genisoimage.found()
                 genisoimage_type = 'mkisofs'