aboutsummaryrefslogtreecommitdiff
path: root/openssl/test
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2015-12-17 20:08:44 -0800
committerSteven Fackler <[email protected]>2015-12-17 21:13:44 -0800
commite077ed0b4d3c87fb38d2d9536f669cf569b69234 (patch)
treef947efec0386bf56bb795bd998ecd065ef5bec17 /openssl/test
parentFix nonblocking behavior (diff)
downloadrust-openssl-e077ed0b4d3c87fb38d2d9536f669cf569b69234.tar.xz
rust-openssl-e077ed0b4d3c87fb38d2d9536f669cf569b69234.zip
Disable cross compilation for now
Diffstat (limited to 'openssl/test')
-rwxr-xr-xopenssl/test/build.sh10
-rwxr-xr-xopenssl/test/run.sh1
2 files changed, 8 insertions, 3 deletions
diff --git a/openssl/test/build.sh b/openssl/test/build.sh
index a10cd8ad..f52ded60 100755
--- a/openssl/test/build.sh
+++ b/openssl/test/build.sh
@@ -5,13 +5,17 @@ if [ "$TRAVIS_OS_NAME" == "osx" ]; then
exit 0
fi
-if [ -n "$TARGET" ]; then
- FLAGS="os/compiler=$TARGET-"
+if [ "$TARGET" == "arm-unknown-linux-gnueabihf" ]; then
+ export C_INCLUDE_PATH=/usr/arm-linux-gnueabihf/include
+ CROSS=arm-linux-gnueabihf-
+ OS_COMPILER=linux-armv4
+else
+ OS_COMPILER=linux-x86_64
fi
mkdir /tmp/openssl
cd /tmp/openssl
curl https://openssl.org/source/openssl-1.0.2e.tar.gz | tar --strip-components=1 -xzf -
-./Configure --prefix=$HOME/openssl shared $FLAGS
+./Configure --prefix=$HOME/openssl shared --cross-compile-prefix=$CROSS $OS_COMPILER
make
make install
diff --git a/openssl/test/run.sh b/openssl/test/run.sh
index ca029ef2..229d9a1d 100755
--- a/openssl/test/run.sh
+++ b/openssl/test/run.sh
@@ -28,4 +28,5 @@ else
COMMAND="test"
fi
+export PATH=$HOME/openssl/bin:$PATH
(cd openssl && cargo $COMMAND $FLAGS --features "$FEATURES")