jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-08-02 07:57:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

toolchain/gcc: make version detection more robust

Browse Source 
Thanks to Bernhard for noticing (and less so for causing the problem in
the first place :P)
This commit is contained in:
Peter Korsgaard 2009-01-22 11:18:44 +00:00
parent 9caca74d26
commit 77662160bb
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
toolchain/gcc/gcc-uclibc-4.x.mk
View File

@ -347,7 +347,7 @@ endif
# Now for the ugly 3.3.x soft float hack... # Now for the ugly 3.3.x soft float hack...
# #
ifeq ($(BR2_SOFT_FLOAT),y) ifeq ($(BR2_SOFT_FLOAT),y)
ifeq ($(findstring 3.3.,$(GCC_VERSION)),3.3.) ifeq ($(findstring x3.3.,x$(GCC_VERSION)),x3.3.)
# Make sure we have a soft float specs file for this arch # Make sure we have a soft float specs file for this arch
if [ ! -f toolchain/gcc/$(GCC_VERSION)/specs-$(ARCH)-soft-float ]; then \ if [ ! -f toolchain/gcc/$(GCC_VERSION)/specs-$(ARCH)-soft-float ]; then \
echo soft float configured but no specs file for this arch; \ echo soft float configured but no specs file for this arch; \
@ -464,20 +464,20 @@ $(GCC_BUILD_DIR3)/.compiled: $(GCC_BUILD_DIR3)/.configured
# #
# gcc-lib dir changes names to gcc with 3.4.mumble # gcc-lib dir changes names to gcc with 3.4.mumble
# #
ifeq ($(findstring 3.4.,$(GCC_VERSION)),3.4.) ifeq ($(findstring x3.4.,x$(GCC_VERSION)),x3.4.)
GCC_LIB_SUBDIR=lib/gcc/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION) GCC_LIB_SUBDIR=lib/gcc/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)
else else
GCC_LIB_SUBDIR=lib/gcc-lib/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION) GCC_LIB_SUBDIR=lib/gcc-lib/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)
endif endif
# sigh... we need to find a better way # sigh... we need to find a better way
ifeq ($(findstring 4.0.,$(GCC_VERSION)),4.0.) ifeq ($(findstring x4.0.,x$(GCC_VERSION)),x4.0.)
GCC_LIB_SUBDIR=lib/gcc/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION) GCC_LIB_SUBDIR=lib/gcc/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)
endif endif
ifeq ($(findstring 4.1.,$(GCC_VERSION)),4.1.) ifeq ($(findstring x4.1.,x$(GCC_VERSION)),x4.1.)
GCC_LIB_SUBDIR=lib/gcc/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION) GCC_LIB_SUBDIR=lib/gcc/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)
endif endif
ifeq ($(findstring 4.2,$(GCC_VERSION)),4.2) ifeq ($(findstring x4.2,x$(GCC_VERSION)),x4.2)
ifneq ($(findstring 4.2.,$(GCC_VERSION)),4.2.) ifneq ($(findstring x4.2.,x$(GCC_VERSION)),x4.2.)
REAL_GCC_VERSION=$(shell cat $(GCC_SRC_DIR)/gcc/BASE-VER) REAL_GCC_VERSION=$(shell cat $(GCC_SRC_DIR)/gcc/BASE-VER)
GCC_LIB_SUBDIR=lib/gcc/$(REAL_GNU_TARGET_NAME)/$(REAL_GCC_VERSION) GCC_LIB_SUBDIR=lib/gcc/$(REAL_GNU_TARGET_NAME)/$(REAL_GCC_VERSION)
else else
@ -485,7 +485,7 @@ GCC_LIB_SUBDIR=lib/gcc/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)
endif endif
endif endif
GCC_INCLUDE_DIR:=include GCC_INCLUDE_DIR:=include
ifeq ($(findstring 4.3,$(GCC_VERSION)),4.3) ifeq ($(findstring x4.3,x$(GCC_VERSION)),x4.3)
GCC_LIB_SUBDIR=lib/gcc/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION) GCC_LIB_SUBDIR=lib/gcc/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)
GCC_INCLUDE_DIR:=include-fixed GCC_INCLUDE_DIR:=include-fixed
endif endif
@ -499,7 +499,7 @@ $(TARGET_DIR)/usr/bin/gcc: $(GCC_BUILD_DIR3)/.compiled
# Now for the ugly 3.3.x soft float hack... # Now for the ugly 3.3.x soft float hack...
# #
ifeq ($(BR2_SOFT_FLOAT),y) ifeq ($(BR2_SOFT_FLOAT),y)
ifeq ($(findstring 3.3.,$(GCC_VERSION)),3.3.) ifeq ($(findstring x3.3.,x$(GCC_VERSION)),x3.3.)
# Add a specs file that defaults to soft float mode. # Add a specs file that defaults to soft float mode.
cp toolchain/gcc/$(GCC_VERSION)/specs-$(ARCH)-soft-float $(TARGET_DIR)/usr/lib/gcc-lib/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/specs cp toolchain/gcc/$(GCC_VERSION)/specs-$(ARCH)-soft-float $(TARGET_DIR)/usr/lib/gcc-lib/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/specs
# Make sure gcc does not think we are cross compiling # Make sure gcc does not think we are cross compiling