mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-28 13:46:32 +00:00
Kristian Hoffmann writes:
TARGET_LANGUAGES wasn't being set correctly if you enable GCJ or C++ in the buildroot config. It looks like INSTALL_LIBSTDCPP and INSTALL_LIBGCJ were renamed to BR2_INSTALL_... in the config system, but not in the gcc and ccache makefiles. -Kristian
This commit is contained in:
parent
8500fcd5fd
commit
dbfd77f671
@ -62,7 +62,7 @@ $(STAGING_DIR)/$(CCACHE_TARGET_BINARY): $(CCACHE_DIR1)/$(CCACHE_BINARY)
|
|||||||
ln -fs ../usr/bin/ccache $(GNU_TARGET_NAME)-gcc; \
|
ln -fs ../usr/bin/ccache $(GNU_TARGET_NAME)-gcc; \
|
||||||
ln -fs ../usr/bin/ccache $(REAL_GNU_TARGET_NAME)-cc; \
|
ln -fs ../usr/bin/ccache $(REAL_GNU_TARGET_NAME)-cc; \
|
||||||
ln -fs ../usr/bin/ccache $(REAL_GNU_TARGET_NAME)-gcc);
|
ln -fs ../usr/bin/ccache $(REAL_GNU_TARGET_NAME)-gcc);
|
||||||
ifeq ($(INSTALL_LIBSTDCPP),true)
|
ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
|
||||||
[ -f $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-c++ ] && \
|
[ -f $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-c++ ] && \
|
||||||
mv $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-c++ $(STAGING_DIR)/bin-ccache/
|
mv $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-c++ $(STAGING_DIR)/bin-ccache/
|
||||||
[ -f $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-g++ ] && \
|
[ -f $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-g++ ] && \
|
||||||
|
@ -21,11 +21,6 @@ TARGET_SOFT_FLOAT:=
|
|||||||
ARCH_FPU_SUFFIX:=
|
ARCH_FPU_SUFFIX:=
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(INSTALL_LIBGCJ),true)
|
|
||||||
INSTALL_LIBSTDCPP:=true
|
|
||||||
endif
|
|
||||||
|
|
||||||
|
|
||||||
ifeq ($(strip $(BR2_PACKAGE_GCC_TARGET)),y)
|
ifeq ($(strip $(BR2_PACKAGE_GCC_TARGET)),y)
|
||||||
TARGETS+=gcc_target
|
TARGETS+=gcc_target
|
||||||
endif
|
endif
|
||||||
|
@ -36,7 +36,7 @@ GCC_STRIP_HOST_BINARIES:=true
|
|||||||
#
|
#
|
||||||
#############################################################
|
#############################################################
|
||||||
|
|
||||||
ifeq ($(INSTALL_LIBSTDCPP),true)
|
ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
|
||||||
TARGET_LANGUAGES:=c,c++
|
TARGET_LANGUAGES:=c,c++
|
||||||
STLPORT_TARGET=stlport
|
STLPORT_TARGET=stlport
|
||||||
else
|
else
|
||||||
|
@ -39,10 +39,10 @@ GCC_STRIP_HOST_BINARIES:=true
|
|||||||
#
|
#
|
||||||
#############################################################
|
#############################################################
|
||||||
|
|
||||||
ifeq ($(INSTALL_LIBGCJ),true)
|
ifeq ($(BR2_INSTALL_LIBGCJ),y)
|
||||||
TARGET_LANGUAGES:=c,c++,java
|
TARGET_LANGUAGES:=c,c++,java
|
||||||
else
|
else
|
||||||
ifeq ($(INSTALL_LIBSTDCPP),true)
|
ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
|
||||||
TARGET_LANGUAGES:=c,c++
|
TARGET_LANGUAGES:=c,c++
|
||||||
else
|
else
|
||||||
TARGET_LANGUAGES:=c
|
TARGET_LANGUAGES:=c
|
||||||
|
Loading…
x
Reference in New Issue
Block a user