Changeset 9c4df21 in mainline for uspace/Makefile.common


Ignore:
Timestamp:
2019-01-08T12:50:24Z (5 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
d3e938c
Parents:
3d7594d
git-author:
Jiri Svoboda <jiri@…> (2018-01-07 21:49:57)
git-committer:
Jiri Svoboda <jiri@…> (2019-01-08 12:50:24)
Message:

Should never link static libc into shared library

This could happen with BUILD_SHARED_LIBS=y, USE_SHARED_LIBS=n.
We somehow got away with it on ia32, but amd64 is more picky.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/Makefile.common

    r3d7594d r9c4df21  
    120120                STATIC_BUILD = y
    121121        else
    122                 ifeq ($(CONFIG_USE_SHARED_LIBS),y)
    123                         STATIC_BUILD = n
     122                ifeq ($(CONFIG_BUILD_SHARED_LIBS),y)
     123                        ifeq ($(CONFIG_USE_SHARED_LIBS),y)
     124                                STATIC_BUILD = n
     125                        else
     126                                ifeq ($(LIBRARY),)
     127                                        STATIC_BUILD = y
     128                                else
     129                                        STATIC_BUILD = n
     130                                endif
     131                        endif
    124132                else
    125133                        STATIC_BUILD = y
Note: See TracChangeset for help on using the changeset viewer.