projects
/
hvlinux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upgrade xterm
[hvlinux.git]
/
stage0
/
pkg
/
gcc
diff --git
a/stage0/pkg/gcc
b/stage0/pkg/gcc
index
5746dab
..
24ee1ef
100644
(file)
--- a/
stage0/pkg/gcc
+++ b/
stage0/pkg/gcc
@@
-19,10
+19,14
@@
hvpatch()
esac
}
esac
}
-
configure
_pre()
+
hvconfig
_pre()
{
{
+ export AR=ar
+ export LDFLAGS="-Wl,-rpath,/cross-tools/lib"
+
# Common options for passes 1 & 2
# Common options for passes 1 & 2
- CONFIGURE_OPTS="${CONFIGURE_OPTS} \
+ CONFIGURE_OPTS="\
+ ${CONFIGURE_OPTS} \
--build=${CLFS_HOST} \
--host=${CLFS_HOST} \
--target=${CLFS_TARGET} \
--build=${CLFS_HOST} \
--host=${CLFS_HOST} \
--target=${CLFS_TARGET} \
@@
-30,9
+34,13
@@
configure_pre()
--with-local-prefix=/tools \
--disable-nls \
--with-mpfr=/cross-tools \
--with-local-prefix=/tools \
--disable-nls \
--with-mpfr=/cross-tools \
- --with-gmp=/cross-tools"
+ --with-gmp=/cross-tools \
+ --with-ppl=/cross-tools \
+ --with-cloog=/cross-tools \
+ --enable-cloog-backend=isl \
+ --disable-multilib"
- if [
-n "${GCC_PASS1}
" ]; then
+ if [
"x${HVLABEL}" = "x${GCC}-pass1
" ]; then
CONFIGURE_OPTS="${CONFIGURE_OPTS} \
--disable-shared \
--without-headers \
CONFIGURE_OPTS="${CONFIGURE_OPTS} \
--disable-shared \
--without-headers \
@@
-53,14
+61,6
@@
configure_pre()
--enable-threads=posix"
fi
--enable-threads=posix"
fi
- case "${HVL_TARGET}" in
- *)
- CONFIGURE_OPTS="${CONFIGURE_OPTS} --with-ppl=/cross-tools \
- --with-cloog=/cross-tools \
- --disable-multilib"
- ;;
- esac
-
cd ${LFS_TMP}/${PACKAGE}
# Change the StartFile Spec to point to the correct library location:
cd ${LFS_TMP}/${PACKAGE}
# Change the StartFile Spec to point to the correct library location:
@@
-73,16
+73,22
@@
configure_pre()
sed -e "s@\(^CROSS_SYSTEM_HEADER_DIR =\).*@\1 /tools/include@g" \
-i gcc/Makefile.in
sed -e "s@\(^CROSS_SYSTEM_HEADER_DIR =\).*@\1 /tools/include@g" \
-i gcc/Makefile.in
- if [
-n "${GCC_PASS1}
" ]; then
+ if [
"x${HVLABEL}" = "x${GCC}-pass1
" ]; then
# We will create a dummy limits.h so the build will not use the one
# provided by the host distro:
touch /tools/include/limits.h
fi
}
# We will create a dummy limits.h so the build will not use the one
# provided by the host distro:
touch /tools/include/limits.h
fi
}
+hvconfig_post()
+{
+ unset AR
+ unset LDFLAGS
+}
+
hvbuild()
{
hvbuild()
{
- if [
-n "${GCC_PASS1}
" ]; then
+ if [
"x${HVLABEL}" = "x${GCC}-pass1
" ]; then
${HVMAKE} all-gcc all-target-libgcc
${HVMAKE} install-gcc install-target-libgcc
else
${HVMAKE} all-gcc all-target-libgcc
${HVMAKE} install-gcc install-target-libgcc
else