Changeset eff9f8c in mainline for uspace/Makefile.common


Ignore:
Timestamp:
2016-05-15T08:21:20Z (10 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
f6017ee
Parents:
362654a
git-author:
Vojtech Horky <vojtech.horky@…> (2016-05-15 08:21:20)
git-committer:
Jakub Jermar <jakub@…> (2016-05-15 08:21:20)
Message:

Fix build error during incremental build and after modifying libc

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/Makefile.common

    r362654a reff9f8c  
    198198
    199199ifeq ($(STATIC_BUILD),y)
    200         BASE_LIBS = $(LIBC_PREFIX)/libc.a $(LIBSOFTINT_PREFIX)/libsoftint.a
     200        BASE_LIBS = $(LIBC_PREFIX)/libc.a $(LIBURCU_PREFIX)/liburcu.a $(LIBSOFTINT_PREFIX)/libsoftint.a
    201201        LINKER_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld
    202202        ifeq ($(MATH),y)
    … …  
    331331endif
    332332
     333
     334ifneq ($(MAKECMDGOALS),clean)
    333335-include $(DEPEND)
     336endif
    334337
    335338OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
    … …  
    371374
    372375ifneq ($(LIBRARY),)
    373 %.a: $(OBJECTS)
     376$(LIBRARY).a: $(OBJECTS)
    374377        $(AR) rc $@ $(OBJECTS)
    375378endif
    376379
    377380ifneq ($(SLIBRARY),)
    378 %.la: $(LOBJECTS)
     381$(SLIBRARY).la: $(LOBJECTS)
    379382        $(AR) rc $@ $(LOBJECTS)
    380383endif
Note: See TracChangeset for help on using the changeset viewer.