Changeset 667c3fc in mainline for Makefile


Ignore:
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

File:
1 edited

Legend:

Unmodified
Added
Removed

  • Makefile

    rd4b30cf r667c3fc  
    5050-include $(COMMON_MAKEFILE)
    5151
    52 # TODO: make meson reconfigure correctly when library build changes
    53 
    54 ifeq ($(CONFIG_BUILD_SHARED_LIBS),y)
    55         MESON_ARGS = -Ddefault_library=shared
    56 else
    57         MESON_ARGS = -Ddefault_library=static
    58 endif
    59 
    6052CROSS_TARGET ?= $(UARCH)
    6153
    … …  
    6961
    7062$(BUILD_DIR)/build.ninja: $(CONFIG_MAKEFILE) $(VERSION_FILE)
    71         meson . $(BUILD_DIR) --cross-file meson/cross/$(CROSS_TARGET) $(MESON_ARGS)
     63        meson . $(BUILD_DIR) --cross-file meson/cross/$(CROSS_TARGET)
    7264
    7365meson: $(COMMON_MAKEFILE) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) $(ERRNO_HEADER) $(BUILD_DIR)/build.ninja
Note: See TracChangeset for help on using the changeset viewer.