mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
Merge from bittboy/buildroot@26c91a9
This commit is contained in:
@@ -93,6 +93,7 @@ TOOLCHAIN_EXTERNAL_SUFFIX = \
|
||||
TOOLCHAIN_EXTERNAL_CROSS = $(TOOLCHAIN_EXTERNAL_BIN)/$(TOOLCHAIN_EXTERNAL_PREFIX)-
|
||||
TOOLCHAIN_EXTERNAL_CC = $(TOOLCHAIN_EXTERNAL_CROSS)gcc$(TOOLCHAIN_EXTERNAL_SUFFIX)
|
||||
TOOLCHAIN_EXTERNAL_CXX = $(TOOLCHAIN_EXTERNAL_CROSS)g++$(TOOLCHAIN_EXTERNAL_SUFFIX)
|
||||
TOOLCHAIN_EXTERNAL_GDC = $(TOOLCHAIN_EXTERNAL_CROSS)gdc$(TOOLCHAIN_EXTERNAL_SUFFIX)
|
||||
TOOLCHAIN_EXTERNAL_FC = $(TOOLCHAIN_EXTERNAL_CROSS)gfortran$(TOOLCHAIN_EXTERNAL_SUFFIX)
|
||||
TOOLCHAIN_EXTERNAL_READELF = $(TOOLCHAIN_EXTERNAL_CROSS)readelf
|
||||
|
||||
@@ -112,7 +113,11 @@ endif
|
||||
# Definitions of the list of libraries that should be copied to the target.
|
||||
#
|
||||
|
||||
TOOLCHAIN_EXTERNAL_LIBS += ld*.so* libgcc_s.so.* libatomic.so.*
|
||||
TOOLCHAIN_EXTERNAL_LIBS += ld*.so.* libgcc_s.so.* libatomic.so.*
|
||||
|
||||
ifneq ($(BR2_SSP_NONE),y)
|
||||
TOOLCHAIN_EXTERNAL_LIBS += libssp.so.*
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y)
|
||||
TOOLCHAIN_EXTERNAL_LIBS += libc.so.* libcrypt.so.* libdl.so.* libm.so.* libnsl.so.* libresolv.so.* librt.so.* libutil.so.*
|
||||
@@ -148,7 +153,11 @@ ifeq ($(BR2_TOOLCHAIN_HAS_OPENMP),y)
|
||||
TOOLCHAIN_EXTERNAL_LIBS += libgomp.so.*
|
||||
endif
|
||||
|
||||
TOOLCHAIN_EXTERNAL_LIBS += $(call qstrip,$(BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS))
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_DLANG),y)
|
||||
TOOLCHAIN_EXTERNAL_LIBS += libgdruntime.so* libgphobos.so*
|
||||
endif
|
||||
|
||||
TOOLCHAIN_EXTERNAL_LIBS += $(addsuffix .so*,$(call qstrip,$(BR2_TOOLCHAIN_EXTRA_LIBS)))
|
||||
|
||||
|
||||
#
|
||||
@@ -258,7 +267,7 @@ define TOOLCHAIN_EXTERNAL_INSTALL_WRAPPER
|
||||
*-ar|*-ranlib|*-nm) \
|
||||
ln -sf $$(echo $$i | sed 's%^$(HOST_DIR)%..%') .; \
|
||||
;; \
|
||||
*cc|*cc-*|*++|*++-*|*cpp|*-gfortran) \
|
||||
*cc|*cc-*|*++|*++-*|*cpp|*-gfortran|*-gdc) \
|
||||
ln -sf toolchain-wrapper $$base; \
|
||||
;; \
|
||||
*gdb|*gdbtui) \
|
||||
@@ -490,6 +499,12 @@ define TOOLCHAIN_EXTERNAL_FIXUP_UCLIBCNG_LDSO
|
||||
fi
|
||||
endef
|
||||
|
||||
define TOOLCHAIN_EXTERNAL_INSTALL_TARGET_LDD
|
||||
$(Q)if test -f $(STAGING_DIR)/usr/bin/ldd ; then \
|
||||
$(INSTALL) -D $(STAGING_DIR)/usr/bin/ldd $(TARGET_DIR)/usr/bin/ldd ; \
|
||||
$(SED) 's:.*/bin/bash:#!/bin/sh:' $(TARGET_DIR)/usr/bin/ldd ; \
|
||||
fi
|
||||
endef
|
||||
|
||||
################################################################################
|
||||
# inner-toolchain-external-package -- defines the generic installation rules
|
||||
@@ -531,8 +546,10 @@ define $(2)_CONFIGURE_CMDS
|
||||
$$(Q)$$(call check_unusable_toolchain,$$(TOOLCHAIN_EXTERNAL_CC))
|
||||
$$(Q)SYSROOT_DIR="$$(call toolchain_find_sysroot,$$(TOOLCHAIN_EXTERNAL_CC))" ; \
|
||||
$$(call check_kernel_headers_version,\
|
||||
$$(BUILD_DIR),\
|
||||
$$(call toolchain_find_sysroot,$$(TOOLCHAIN_EXTERNAL_CC)),\
|
||||
$$(call qstrip,$$(BR2_TOOLCHAIN_HEADERS_AT_LEAST))); \
|
||||
$$(call qstrip,$$(BR2_TOOLCHAIN_HEADERS_AT_LEAST)),\
|
||||
$$(if $$(BR2_TOOLCHAIN_EXTERNAL_CUSTOM),loose,strict)); \
|
||||
$$(call check_gcc_version,$$(TOOLCHAIN_EXTERNAL_CC),\
|
||||
$$(call qstrip,$$(BR2_TOOLCHAIN_GCC_AT_LEAST))); \
|
||||
if test "$$(BR2_arm)" = "y" ; then \
|
||||
@@ -542,6 +559,9 @@ define $(2)_CONFIGURE_CMDS
|
||||
if test "$$(BR2_INSTALL_LIBSTDCPP)" = "y" ; then \
|
||||
$$(call check_cplusplus,$$(TOOLCHAIN_EXTERNAL_CXX)) ; \
|
||||
fi ; \
|
||||
if test "$$(BR2_TOOLCHAIN_HAS_DLANG)" = "y" ; then \
|
||||
$$(call check_dlang,$$(TOOLCHAIN_EXTERNAL_GDC)) ; \
|
||||
fi ; \
|
||||
if test "$$(BR2_TOOLCHAIN_HAS_FORTRAN)" = "y" ; then \
|
||||
$$(call check_fortran,$$(TOOLCHAIN_EXTERNAL_FC)) ; \
|
||||
fi ; \
|
||||
@@ -579,6 +599,7 @@ define $(2)_INSTALL_TARGET_CMDS
|
||||
$$(TOOLCHAIN_EXTERNAL_INSTALL_TARGET_LIBS)
|
||||
$$(TOOLCHAIN_EXTERNAL_INSTALL_TARGET_GDBSERVER)
|
||||
$$(TOOLCHAIN_EXTERNAL_FIXUP_UCLIBCNG_LDSO)
|
||||
$$(TOOLCHAIN_EXTERNAL_INSTALL_TARGET_LDD)
|
||||
endef
|
||||
|
||||
# Call the generic package infrastructure to generate the necessary
|
||||
|
||||
Reference in New Issue
Block a user