* added checking of legacy gcc against required version, suggested by Axel
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18736 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -90,8 +90,11 @@ standard_gcc_settings()
|
|||||||
# PLATFORM_LINKLIBS
|
# PLATFORM_LINKLIBS
|
||||||
gcclib=`$HAIKU_CC -print-libgcc-file-name`
|
gcclib=`$HAIKU_CC -print-libgcc-file-name`
|
||||||
gccdir=`dirname ${gcclib}`
|
gccdir=`dirname ${gcclib}`
|
||||||
|
|
||||||
haikuGCCVersion=`$HAIKU_CC -dumpversion`
|
haikuGCCVersion=`$HAIKU_CC -dumpversion`
|
||||||
haikuGCCMachine=`$HAIKU_CC -dumpmachine`
|
haikuGCCMachine=`$HAIKU_CC -dumpmachine`
|
||||||
|
haikuRequiredLegacyGCCVersion="2.95.3-beos-060710"
|
||||||
|
# version of legacy gcc required to build haiku
|
||||||
|
|
||||||
HAIKU_GCC_LIB_DIR=${gccdir}
|
HAIKU_GCC_LIB_DIR=${gccdir}
|
||||||
HAIKU_GCC_LIBGCC=${gccdir}/libgcc.a
|
HAIKU_GCC_LIBGCC=${gccdir}/libgcc.a
|
||||||
@@ -101,9 +104,10 @@ standard_gcc_settings()
|
|||||||
# Note: We filter out eabi.o. It's present in gcc's libgcc for PPC and
|
# Note: We filter out eabi.o. It's present in gcc's libgcc for PPC and
|
||||||
# neither needed nor wanted.
|
# neither needed nor wanted.
|
||||||
|
|
||||||
# for gcc 4 we use the libstdc++ and libsupc++ that come with the compiler
|
|
||||||
case $haikuGCCVersion in
|
case $haikuGCCVersion in
|
||||||
4.*)
|
4.*)
|
||||||
|
# for gcc 4 we use the libstdc++ and libsupc++ that come with the
|
||||||
|
# compiler
|
||||||
haikuStaticLibStdCxx=`$HAIKU_CC -print-file-name=libstdc++.a`
|
haikuStaticLibStdCxx=`$HAIKU_CC -print-file-name=libstdc++.a`
|
||||||
haikuSharedLibStdCxx=`$HAIKU_CC -print-file-name=libstdc++.so`
|
haikuSharedLibStdCxx=`$HAIKU_CC -print-file-name=libstdc++.so`
|
||||||
haikuStaticLibSupCxx=`$HAIKU_CC -print-file-name=libsupc++.a`
|
haikuStaticLibSupCxx=`$HAIKU_CC -print-file-name=libsupc++.a`
|
||||||
@@ -130,6 +134,15 @@ standard_gcc_settings()
|
|||||||
haikuSharedLibSupCxx=
|
haikuSharedLibSupCxx=
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
2.95*)
|
||||||
|
# check for correct (most up-to-date) legacy compiler and complain
|
||||||
|
# if an older one is installed
|
||||||
|
if [ $haikuGCCVersion != $haikuRequiredLegacyGCCVersion ]; then
|
||||||
|
echo "GCC version $haikuRequiredLegacyGCCVersion is required!";
|
||||||
|
echo "Please download it from www.haiku-os.org...";
|
||||||
|
exit 1;
|
||||||
|
fi
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user