mirror of
https://github.com/corda/corda.git
synced 2025-01-01 02:36:44 +00:00
Merge pull request #43 from rodolfoams/master
Fixes problem described in issue #40
This commit is contained in:
commit
cdf56372ec
@ -57,8 +57,8 @@ BUILD_DIR=${ROOT_DIR}/build/linux
|
||||
# Get the architecture of the build from generated binary
|
||||
get_arch()
|
||||
{
|
||||
local a=$(readelf -h $BUILD_DIR/sgx_sign | awk '/Class:/{print $2}')
|
||||
test $a = ELF64 && echo 'x86_64' || echo 'x86'
|
||||
local a=$(readelf -h $BUILD_DIR/sgx_sign | sed -n '2p' | awk '/:/{print $6}')
|
||||
test $a = 02 && echo 'x86_64' || echo 'x86'
|
||||
}
|
||||
|
||||
|
||||
|
@ -47,8 +47,8 @@ rm -fr ${INSTALL_PATH}
|
||||
# Get the architecture of the build from generated binary
|
||||
get_arch()
|
||||
{
|
||||
local a=$(readelf -h $BUILD_DIR/sgx_sign | awk '/Class:/{print $2}')
|
||||
test $a = ELF64 && echo 'x64' || echo 'x86'
|
||||
local a=$(readelf -h $BUILD_DIR/sgx_sign | sed -n '2p' | awk '/:/{print $6}')
|
||||
test $a = 02 && echo 'x64' || echo 'x86'
|
||||
}
|
||||
|
||||
ARCH=$(get_arch)
|
||||
|
@ -47,8 +47,8 @@ rm -fr ${INSTALL_PATH}
|
||||
# Get the architecture of the build from generated binary
|
||||
get_arch()
|
||||
{
|
||||
local a=$(readelf -h $BUILD_DIR/sgx_sign | awk '/Class:/{print $2}')
|
||||
test $a = ELF64 && echo 'x64' || echo 'x86'
|
||||
local a=$(readelf -h $BUILD_DIR/sgx_sign | sed -n '2p' | awk '/:/{print $6}')
|
||||
test $a = 02 && echo 'x64' || echo 'x86'
|
||||
}
|
||||
|
||||
ARCH=$(get_arch)
|
||||
|
Loading…
Reference in New Issue
Block a user