Changeset 667c3fc in mainline

Timestamp:

2019-08-17T12:49:43Z (5 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:

56440a5

Parents:

d4b30cf

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-30 13:30:45)

git-committer:

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

Message:

Fix handling of CONFIG_BUILD_SHARED_LIBS

Files:

• Makefile (modified) (2 diffs)
• meson.build (modified) (3 diffs)
• uspace/lib/meson.build (modified) (1 diff)

Makefile

@@ -50 +50 @@
 -include $(COMMON_MAKEFILE)
 
-# TODO: make meson reconfigure correctly when library build changes
-
-ifeq ($(CONFIG_BUILD_SHARED_LIBS),y)
-        MESON_ARGS = -Ddefault_library=shared
-else
-        MESON_ARGS = -Ddefault_library=static
-endif
-
 CROSS_TARGET ?= $(UARCH)
 
@@ -69 +61 @@
 
 $(BUILD_DIR)/build.ninja: $(CONFIG_MAKEFILE) $(VERSION_FILE)
-        meson . $(BUILD_DIR) --cross-file meson/cross/$(CROSS_TARGET) $(MESON_ARGS)
+        meson . $(BUILD_DIR) --cross-file meson/cross/$(CROSS_TARGET)
 
 meson: $(COMMON_MAKEFILE) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) $(ERRNO_HEADER) $(BUILD_DIR)/build.ninja

meson.build

@@ -2 +2 @@
 # TODO: jobfile
 # TODO: lto
-# TODO: CONFIG_BUILD_SHARED_LIBS
 # TODO: fix clang build
 
@@ -8 +7 @@
     'HelenOS',
     [ 'c', 'cpp' ],
-    default_options : ['buildtype=plain', 'c_std=gnu11', 'cpp_std=c++17', 'warning_level=3', 'werror=false', 'b_staticpic=false', 'default_library=shared', 'prefix=/' ],
+    default_options : ['buildtype=plain', 'c_std=gnu11', 'cpp_std=c++17', 'warning_level=3', 'werror=false', 'b_staticpic=false', 'prefix=/' ],
     meson_version: '>=0.50.1',
 )
@@ -83 +82 @@
         '@INPUT@',
 ]
-
-if get_option('default_library') == 'both'
-        error('You must use either shared or static for default_library.')
-endif
 
 debug_options = false

uspace/lib/meson.build

@@ -1 @@
-always_static = (get_option('default_library') == 'static')
+always_static = not CONFIG_BUILD_SHARED_LIBS
 
 # Which libraries are installed when CONFIG_DEVEL_FILES is enabled