mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 19:50:05 +02:00
config_autoconf, extutils_libbuilder: fix tests on x86_gcc2
haikuporter runs in a gcc2 environment when not building secondaryArch packages on x86_gcc2, so some additional environment changes are needed so that gcc-x86 actually works.
This commit is contained in:
@@ -38,6 +38,7 @@ TEST_REQUIRES="
|
||||
"
|
||||
if [ "$targetArchitecture" = x86_gcc2 ]; then
|
||||
TEST_REQUIRES+="
|
||||
haiku_x86_devel
|
||||
cmd:gcc_x86
|
||||
"
|
||||
else
|
||||
@@ -64,5 +65,8 @@ INSTALL()
|
||||
|
||||
TEST()
|
||||
{
|
||||
make test
|
||||
if [ "$targetArchitecture" = x86_gcc2 ]; then
|
||||
gccSecondaryArch="CC=gcc-x86 LD=gcc-x86"
|
||||
fi
|
||||
make $gccSecondaryArch test
|
||||
}
|
||||
|
||||
@@ -32,6 +32,7 @@ BUILD_PREREQUIRES="
|
||||
|
||||
if [ "$targetArchitecture" = x86_gcc2 ]; then
|
||||
TEST_REQUIRES="
|
||||
haiku_x86_devel
|
||||
cmd:gcc_x86
|
||||
"
|
||||
else
|
||||
@@ -57,5 +58,9 @@ INSTALL()
|
||||
}
|
||||
|
||||
TEST() {
|
||||
if [ "$targetArchitecture" = x86_gcc2 ]; then
|
||||
export CC=gcc-x86
|
||||
export LD=gcc-x86
|
||||
fi
|
||||
./Build test
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user