Changeset 63660a3 in mainline for uspace/lib/meson.build

Timestamp:

2019-08-17T12:49:43Z (6 years ago)

Author:

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

Branches:

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

Children:

41408d94

Parents:

2c38a55b

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-26 14:31:18)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-08-17 12:49:43)

Message:

shuffle some variables around

File:

• uspace/lib/meson.build (modified) (4 diffs)

uspace/lib/meson.build

@@ -1 +1 @@
 always_static = (get_option('default_library') == 'static')
-
-# Redefined in libarch, if necessary.
-# Used in a few places where we generate custom assembly.
-as_prolog = ''
 
 # Which libraries are installed when CONFIG_DEVEL_FILES is enabled
@@ -173 +169 @@
                                 include_directories: [ private_includes, includes ],
                                 dependencies: _shared_deps,
-                                c_args: c_args,
-                                link_args: link_args,
+                                c_args: arch_uspace_c_args + c_args,
+                                cpp_args: arch_uspace_c_args + c_args,
+                                link_args: arch_uspace_c_args + arch_uspace_link_args + link_args,
                                 version: version,
                                 build_by_default: true,
@@ -207 +204 @@
                         include_directories: [ private_includes, includes ],
                         dependencies: _include_deps,
-                        c_args: c_args,
-                        link_args: link_args,
+                        c_args: arch_uspace_c_args + c_args,
+                        cpp_args: arch_uspace_c_args + c_args,
                         install: install_static_lib,
                         install_dir: 'lib',
@@ -295 +292 @@
                 install: true,
                 install_dir: 'test',
-                link_args: _ldargs,
+                c_args: arch_uspace_c_args,
+                cpp_args: arch_uspace_c_args,
+                link_args: arch_uspace_c_args + arch_uspace_link_args + _ldargs,
         )