mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-08-06 01:47:42 +00:00
Merge branch 'fix-gcc-on-target' of git://git.busybox.net/~tpetazzoni/git/buildroot
This commit is contained in:
commit
f806d3430c
@ -50,11 +50,6 @@ EXTRA_GCC_CONFIG_OPTIONS+=--with-build-time-tools=$(STAGING_DIR)/$(REAL_GNU_TARG
|
|||||||
#EXTRA_GCC_CONFIG_OPTIONS+=--with-as=$(TARGET_CROSS)as
|
#EXTRA_GCC_CONFIG_OPTIONS+=--with-as=$(TARGET_CROSS)as
|
||||||
endif
|
endif
|
||||||
|
|
||||||
TARGET_GCC_FLAGS= CFLAGS_FOR_TARGET="$(TARGET_CFLAGS) $(TARGET_SOFT_FLOAT)" \
|
|
||||||
CXXFLAGS_FOR_TARGET="$(TARGET_CFLAGS) $(TARGET_SOFT_FLOAT)" \
|
|
||||||
CFLAGS="$(TARGET_CFLAGS) $(TARGET_SOFT_FLOAT)" \
|
|
||||||
BOOT_CFLAGS="$(TARGET_CFLAGS) $(TARGET_SOFT_FLOAT)"
|
|
||||||
|
|
||||||
ifeq ($(BR2_PACKAGE_GCC_TARGET),y)
|
ifeq ($(BR2_PACKAGE_GCC_TARGET),y)
|
||||||
EXTRA_TARGET_GCC_CONFIG_OPTIONS:=
|
EXTRA_TARGET_GCC_CONFIG_OPTIONS:=
|
||||||
|
|
||||||
|
@ -393,7 +393,12 @@ $(GCC_BUILD_DIR3)/.configured: $(GCC_BUILD_DIR3)/.prepared
|
|||||||
(cd $(GCC_BUILD_DIR3); rm -rf config.cache; \
|
(cd $(GCC_BUILD_DIR3); rm -rf config.cache; \
|
||||||
$(TARGET_CONFIGURE_OPTS) \
|
$(TARGET_CONFIGURE_OPTS) \
|
||||||
$(TARGET_CONFIGURE_ARGS) \
|
$(TARGET_CONFIGURE_ARGS) \
|
||||||
$(TARGET_GCC_FLAGS) \
|
CFLAGS_FOR_TARGET="$(TARGET_CFLAGS) $(TARGET_SOFT_FLOAT)" \
|
||||||
|
CXXFLAGS_FOR_TARGET="$(TARGET_CFLAGS) $(TARGET_SOFT_FLOAT)" \
|
||||||
|
CFLAGS="$(TARGET_CFLAGS) $(TARGET_SOFT_FLOAT)" \
|
||||||
|
BOOT_CFLAGS="$(TARGET_CFLAGS) $(TARGET_SOFT_FLOAT)" \
|
||||||
|
GCC_FOR_TARGET="$(TARGET_CC)" \
|
||||||
|
CC_FOR_TARGET="$(TARGET_CC)" \
|
||||||
$(GCC_SRC_DIR)/configure $(QUIET) \
|
$(GCC_SRC_DIR)/configure $(QUIET) \
|
||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
--build=$(GNU_HOST_NAME) \
|
--build=$(GNU_HOST_NAME) \
|
||||||
@ -440,15 +445,9 @@ $(TARGET_DIR)/usr/bin/gcc: $(GCC_BUILD_DIR3)/.compiled
|
|||||||
# Remove broken specs file (cross compile flag is set).
|
# Remove broken specs file (cross compile flag is set).
|
||||||
rm -f $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/specs
|
rm -f $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/specs
|
||||||
|
|
||||||
-(cd $(TARGET_DIR)/bin && find -type f | xargs $(STRIPCMD) > /dev/null 2>&1)
|
# Remove useless copies of gcc
|
||||||
-(cd $(TARGET_DIR)/usr/bin && find -type f | xargs $(STRIPCMD) > /dev/null 2>&1)
|
rm -f $(TARGET_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc*
|
||||||
-(cd $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR) && $(STRIPCMD) cc1 cc1plus collect2 > /dev/null 2>&1)
|
|
||||||
-(cd $(TARGET_DIR)/usr/lib && $(STRIPCMD) libstdc++.so.*.*.* > /dev/null 2>&1)
|
|
||||||
-(cd $(TARGET_DIR)/lib && $(STRIPCMD) libgcc_s*.so.*.*.* > /dev/null 2>&1)
|
|
||||||
#
|
|
||||||
rm -f $(TARGET_DIR)/usr/lib/*.la*
|
|
||||||
#rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
|
|
||||||
# $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
|
|
||||||
# Work around problem of missing syslimits.h
|
# Work around problem of missing syslimits.h
|
||||||
if [ ! -f $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/$(GCC_INCLUDE_DIR)/syslimits.h ]; then \
|
if [ ! -f $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/$(GCC_INCLUDE_DIR)/syslimits.h ]; then \
|
||||||
echo "warning: working around missing syslimits.h"; \
|
echo "warning: working around missing syslimits.h"; \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user