Changeset dc5c303 in mainline for meson.build

Timestamp:

2023-12-28T13:59:23Z (14 months ago)

Author:

GitHub <noreply@…>

Children:

6b66de6b

Parents:

42c2e65 (diff), f87ff8e (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.

git-author:

boba-buba <120932204+boba-buba@…> (2023-12-28 13:59:23)

git-committer:

GitHub <noreply@…> (2023-12-28 13:59:23)

Message:

Merge branch 'master' into topic/packet-capture

File:

• meson.build (modified) (2 diffs)

meson.build

@@ -36 +36 @@
     [ 'c', 'cpp' ],
     default_options : ['buildtype=plain', 'c_std=gnu11', 'cpp_std=c++17', 'warning_level=2', 'werror=false', 'b_staticpic=false', 'prefix=/' ],
-    meson_version: '>=0.50.1',
+    meson_version: '>=0.55.0',
 )
 
@@ -61 +61 @@
 
 ## Some architectures need a particular string at the beginning of assembly files.
-if not is_variable('kernel_as_prolog')
-        kernel_as_prolog = ''
-endif
 if not is_variable('uspace_as_prolog')
         uspace_as_prolog = ''