Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build the cross gcc for the secondary arch as such

Browse Source 
Pass --enable-hybrid-secondary to gcc's configure when building it as
a secondary compiler. Doesn't make a difference for building Haiku
itself, but makes it easier to match the Haiku cross devel package with
the compiler when building bootstrap packages with haikuporter.

gcc 4 only ATM.
This commit is contained in:
Ingo Weinhold 2013-08-04 17:20:56 +02:00
parent f975dc63f1
commit 68ccc98930
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/scripts/build_cross_tools_gcc4
View File

@ -135,6 +135,10 @@ if [ "$HAIKU_USE_GCC_GRAPHITE" = 1 ]; then
--with-host-libstdcxx=\"-lstdc++\"" --with-host-libstdcxx=\"-lstdc++\""
fi fi
if [ -n "$SECONDARY_ARCH" ]; then
gccConfigureArgs="$gccConfigureArgs --enable-hybrid-secondary"
fi
# force the POSIX locale, as the build (makeinfo) might choke otherwise # force the POSIX locale, as the build (makeinfo) might choke otherwise
export LC_ALL=POSIX export LC_ALL=POSIX

7
configure vendored
View File

@ -649,6 +649,7 @@ else
set_default_value HAIKU_STRIP_$targetArch strip set_default_value HAIKU_STRIP_$targetArch strip
fi fi
isPrimaryArch=1
for targetArch in $targetArchs; do for targetArch in $targetArchs; do
# Note: targetArch is "unknown<n>" at this point, if a cross-tools # Note: targetArch is "unknown<n>" at this point, if a cross-tools
# prefix was specified. The standard_gcc_settings call below will get # prefix was specified. The standard_gcc_settings call below will get
@ -664,6 +665,11 @@ else
if [ $targetArch != x86_gcc2 ]; then if [ $targetArch != x86_gcc2 ]; then
script="${script}_gcc4 $targetMachine" script="${script}_gcc4 $targetMachine"
fi fi
secondaryArch=
if [ -z "$isPrimaryArch" ]; then
secondaryArch=$targetArch
fi
SECONDARY_ARCH=$secondaryArch \
HAIKU_USE_GCC_GRAPHITE=`get_variable \ HAIKU_USE_GCC_GRAPHITE=`get_variable \
HAIKU_USE_GCC_GRAPHITE_$targetArch` \ HAIKU_USE_GCC_GRAPHITE_$targetArch` \
$script "$sourceDir" "$buildCrossTools" "$crossToolsDir" \ $script "$sourceDir" "$buildCrossTools" "$crossToolsDir" \
@ -726,6 +732,7 @@ else
esac esac
HAIKU_PACKAGING_ARCHS="$HAIKU_PACKAGING_ARCHS $targetArch" HAIKU_PACKAGING_ARCHS="$HAIKU_PACKAGING_ARCHS $targetArch"
isPrimaryArch=
done done
fi fi