Changeset 26003


Ignore:
Timestamp:
2011-03-10T13:27:46+01:00 (7 years ago)
Author:
nbd
Message:

base-files: make library relinking uclibc specific and fix libpthread installation for the non-relinked variant

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/base-files/Makefile

    r25983 r26003  
    329329LIBGCC_SO=$(wildcard $(TOOLCHAIN_DIR)/lib/libgcc_s.so.*) 
    330330ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) 
    331   ifneq ($(CONFIG_GCC_VERSION_LINARO),) 
     331  ifneq ($(if $(CONFIG_USE_UCLIBC),$(CONFIG_GCC_VERSION_LINARO)),) 
    332332    BUILD_LIBGCC:=$(if $(CONFIG_avr32)$(CONFIG_m68k)$(CONFIG_powerpc),,$(PKG_BUILD_DIR)/libgcc_s.so.*) 
    333333  endif 
     
    540540        $(CP) \ 
    541541                $(TOOLCHAIN_DIR)/lib/libpthread.so.* \ 
    542                 $(PKG_BUILD_DIR)/libpthread-$(LIBC_SO_VERSION).so \ 
     542                $(if $(BUILD_LIBGCC),\ 
     543                        $(PKG_BUILD_DIR)/libpthread-$(LIBC_SO_VERSION).so, \ 
     544                        $(TOOLCHAIN_DIR)/lib/libpthread-$(LIBC_SO_VERSION).so \ 
     545                ) \ 
    543546                $(1)/lib/ 
    544547  endef 
Note: See TracChangeset for help on using the changeset viewer.