Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 7b884e55 in mainline


Ignore:
Timestamp:
2017-11-08T23:41:26Z (3 years ago)
Author:
jzr <zarevucky.jiri@…>
Branches:
master
Children:
4f674d7
Parents:
378948d
Message:

Also temporarily disallow shared libsoftint.

libsoftint conceptually belongs before libc, but the linker scripts are
generated as part of libc build. The linker scripts will be moved
elsewhere in the future, but for now just link statically.

Location:
uspace
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • uspace/Makefile.common

    r378948d r7b884e55  
    136136
    137137ifeq ($(STATIC_BUILD),y)
    138         BASE_LIBS = $(LIBC_PREFIX)/libc.a $(LIBSOFTINT_PREFIX)/libsoftint.a
    139 else
    140         BASE_LIBS = $(LIBC_PREFIX)/libc.so.0 $(LIBSOFTINT_PREFIX)/libsoftint.so.0
     138        BASE_LIBS = $(LIBC_PREFIX)/libc.a
     139else
     140        BASE_LIBS = $(LIBC_PREFIX)/libc.so.0
    141141        LINK_DYNAMIC = y
    142142endif
    143143
    144 BASE_LIBS += $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a
     144BASE_LIBS += $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a $(LIBSOFTINT_PREFIX)/libsoftint.a
    145145
    146146ifeq ($(LINK_DYNAMIC),y)
  • uspace/lib/softint/Makefile

    r378948d r7b884e55  
    3131EXTRA_CFLAGS = -Iinclude
    3232LIBRARY = libsoftint
    33 SOVERSION = 0.0
    3433
    3534SOURCES = \
Note: See TracChangeset for help on using the changeset viewer.