Skip to content

r9 fix #161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 11, 2013
Merged

r9 fix #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions distribute.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,15 +152,16 @@ function push_arm() {
PYPLATFORM="linux"
fi

if [ "X$ANDROIDNDKVER" == "Xr5b" ]; then
export TOOLCHAIN_PREFIX=arm-eabi
export TOOLCHAIN_VERSION=4.4.0
else
#if [ "X${ANDROIDNDKVER:0:2}" == "Xr7" ] || [ "X$ANDROIDNDKVER" == "Xr8" ]; then
# assume this toolchain is the same for all the next ndk... until a new one is out.
export TOOLCHAIN_PREFIX=arm-linux-androideabi
export TOOLCHAIN_VERSION=4.4.3
fi
if [ "X$ANDROIDNDKVER" == "Xr5b" ]; then
export TOOLCHAIN_PREFIX=arm-eabi
export TOOLCHAIN_VERSION=4.4.0
elif [ "X${ANDROIDNDKVER:0:2}" == "Xr7" ] || [ "X${ANDROIDNDKVER:0:2}" == "Xr8" ]; then
export TOOLCHAIN_PREFIX=arm-linux-androideabi
export TOOLCHAIN_VERSION=4.4.3
elif [ "X${ANDROIDNDKVER}" == "Xr9" ]; then
export TOOLCHAIN_PREFIX=arm-linux-androideabi
export TOOLCHAIN_VERSION=4.8
fi

export PATH="$ANDROIDNDK/toolchains/$TOOLCHAIN_PREFIX-$TOOLCHAIN_VERSION/prebuilt/$PYPLATFORM-x86/bin/:$ANDROIDNDK/toolchains/$TOOLCHAIN_PREFIX-$TOOLCHAIN_VERSION/prebuilt/$PYPLATFORM-x86_64/bin/:$ANDROIDNDK:$ANDROIDSDK/tools:$PATH"

Expand Down
5 changes: 3 additions & 2 deletions src/tools/liblink
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ f.close()

sys.exit(subprocess.call([
environ.get('LD'), '-r',
'-o', output + '.o', '-arch',
environ.get('ARCH')] + objects))
'-o', output + '.o'
#, '-arch', environ.get('ARCH')
] + objects))