Skip to content

Commit 1eabbae

Browse files
author
Stanisław
committed
cleanup
1 parent 7429c52 commit 1eabbae

File tree

2 files changed

+5
-16
lines changed

2 files changed

+5
-16
lines changed

.travis.yml

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,29 +10,19 @@ addons:
1010
- autoconf
1111
- texinfo
1212
- gcc-arm-linux-gnueabihf
13-
14-
before_install:
15-
- sudo apt-get update -qq
16-
- sudo apt-get install -y gcc-arm-linux-gnueabihf
17-
- arm-linux-gnueabihf-gcc --version
18-
- sudo apt-get -y install bc
19-
- sudo apt-get install build-essential
20-
- sudo apt-get install g++-arm-linux-gnueabihf
21-
- if [ `uname -m` = x86_64 ]; then sudo apt-get install libc6-i386 lib32stdc++6 lib32z1; fi
22-
23-
13+
- g++-arm-linux-gnueabihf
2414

2515

2616
install:
2717
- gem install --no-ri --no-rdoc fpm
2818

2919
script:
3020
- export ARCH=arm
31-
- export CROSS_COMPILE=arm-arm-linux-gnueabihf-gcc-4.8
21+
- export CROSS_COMPILE=arm-linux-gnueabihf-gcc-4.8
3222
- export TRAVIS_COMPILER=arm-linux-gnueabihf-gcc-4.8
3323
- export CC=arm-linux-gnueabihf-gcc-4.8
3424
- ./make_deb.sh
35-
25+
3626

3727

3828
# deploy:

build.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@
33
cd openocd
44

55
./bootstrap
6-
CC=gcc-arm-linux-gnueabihf
76

8-
./configure --enable-sysfsgpio --enable-bcm2835gpio --disable-werror --prefix=/tmp/openocd --host=arm-unknown-linux-gnueabihf --target=arm-unknown-linux-gnueabihf
7+
./configure --enable-sysfsgpio --enable-bcm2835gpio --disable-werror --prefix=/tmp/openocd --host=arm-linux-gnueabihf
98

109
make
1110

12-
make install LIBNBIS=no
11+
make install
1312

1413
cd ..

0 commit comments

Comments
 (0)