Skip to content

Commit 6b058cf

Browse files
etretr
committed
Set-up the linker correctly when cross-compiling
1 parent 937de73 commit 6b058cf

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

‎.travis.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ matrix:
109109
- gcc-multilib
110110
- qemu
111111
- qemu-system-arm
112-
env: MATRIX_EVAL="CC='clang -B$HOME/linker_bin/' && CXX='clang++ -B$HOME/linker_bin/'" CROSS_COMPILE=1 ARM_ARCH_DIR=arm-linux-gnueabi ARM_GCC_VER=4.7.3 ARM_SETTINGS="armv7-a -mfpu=neon -mfloat-abi=softfp -target arm-linux-gnueabi"
112+
env: CROSS_COMPILE=1 ARM_LD_PATH=$HOME/linker_bin ARM_ARCH_DIR=arm-linux-gnueabi ARM_GCC_VER=4.7.3 ARM_SETTINGS="armv7-a -mfpu=neon -mfloat-abi=softfp -target arm-linux-gnueabi"
113113
- os: linux
114114
compiler: clang
115115
addons:
@@ -123,7 +123,7 @@ matrix:
123123
- gcc-multilib
124124
- qemu
125125
- qemu-system-arm
126-
env: MATRIX_EVAL="CC='clang -B$HOME/linker_bin/' && CXX='clang++ -B$HOME/linker_bin/'" CROSS_COMPILE=1 ARM_ARCH_DIR=arm-linux-gnueabi ARM_GCC_VER=4.7.3 ARM_SETTINGS="armv8-a -mfpu=neon -mfloat-abi=softfp -target arm-linux-gnueabi"
126+
env: CROSS_COMPILE=1 ARM_LD_PATH=$HOME/linker_bin ARM_ARCH_DIR=arm-linux-gnueabi ARM_GCC_VER=4.7.3 ARM_SETTINGS="armv8-a -mfpu=neon -mfloat-abi=softfp -target arm-linux-gnueabi"
127127
- os: linux
128128
compiler: clang
129129
addons:
@@ -138,8 +138,8 @@ matrix:
138138
- gcc-4.8-multilib
139139
- qemu
140140
- qemu-system-arm
141-
env: MATRIX_EVAL="CC='clang -B$HOME/linker_bin/' && CXX='clang++ -B$HOME/linker_bin/'" CROSS_COMPILE=1 ARM_ARCH_DIR=aarch64-linux-gnu ARM_GCC_VER=4.8.4 ARM_SETTINGS="armv8-a -target aarch64-linux-gnueabi"
141+
env: CROSS_COMPILE=1 ARM_LD_PATH=$HOME/linker_bin ARM_ARCH_DIR=aarch64-linux-gnu ARM_GCC_VER=4.8.4 ARM_SETTINGS="armv8-a -target aarch64-linux-gnueabi"
142142
allow_failures:
143-
- env: MATRIX_EVAL="CC='clang -B$HOME/linker_bin/' && CXX='clang++ -B$HOME/linker_bin/'" CROSS_COMPILE=1 ARM_ARCH_DIR=arm-linux-gnueabi ARM_GCC_VER=4.7.3 ARM_SETTINGS="armv7-a -mfpu=neon -mfloat-abi=softfp -target arm-linux-gnueabi"
144-
- env: MATRIX_EVAL="CC='clang -B$HOME/linker_bin/' && CXX='clang++ -B$HOME/linker_bin/'" CROSS_COMPILE=1 ARM_ARCH_DIR=arm-linux-gnueabi ARM_GCC_VER=4.7.3 ARM_SETTINGS="armv8-a -mfpu=neon -mfloat-abi=softfp -target arm-linux-gnueabi"
145-
- env: MATRIX_EVAL="CC='clang -B$HOME/linker_bin/' && CXX='clang++ -B$HOME/linker_bin/'" CROSS_COMPILE=1 ARM_ARCH_DIR=aarch64-linux-gnu ARM_GCC_VER=4.8.4 ARM_SETTINGS="armv8-a -target aarch64-linux-gnueabi"
143+
- env: CROSS_COMPILE=1 ARM_LD_PATH=$HOME/linker_bin ARM_ARCH_DIR=arm-linux-gnueabi ARM_GCC_VER=4.7.3 ARM_SETTINGS="armv7-a -mfpu=neon -mfloat-abi=softfp -target arm-linux-gnueabi"
144+
- env: CROSS_COMPILE=1 ARM_LD_PATH=$HOME/linker_bin ARM_ARCH_DIR=arm-linux-gnueabi ARM_GCC_VER=4.7.3 ARM_SETTINGS="armv8-a -mfpu=neon -mfloat-abi=softfp -target arm-linux-gnueabi"
145+
- env: CROSS_COMPILE=1 ARM_LD_PATH=$HOME/linker_bin ARM_ARCH_DIR=aarch64-linux-gnu ARM_GCC_VER=4.8.4 ARM_SETTINGS="armv8-a -target aarch64-linux-gnueabi"

‎configure.ac‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,8 @@ if test "$ARM_SETTINGS" != ""; then
272272
fi
273273

274274
if test "$CROSS_COMPILE" == "1"; then
275-
AM_CXXFLAGS="$AM_CXXFLAGS -I/usr/${ARM_ARCH_DIR}/include/c++/${ARM_GCC_VER}/${ARM_ARCH_DIR}/ -I/usr/${ARM_ARCH_DIR}/include/c++/${ARM_GCC_VER}/ -I/usr/${ARM_ARCH_DIR}/include/"
276-
AM_CFLAGS="$AM_CFLAGS -I/usr/${ARM_ARCH_DIR}/include/c++/${ARM_GCC_VER}/${ARM_ARCH_DIR}/ -I/usr/${ARM_ARCH_DIR}/include/c++/${ARM_GCC_VER}/ -I/usr/${ARM_ARCH_DIR}/include/"
275+
AM_CXXFLAGS="$AM_CXXFLAGS --prefix=${ARM_LD_PATH}/ -I/usr/${ARM_ARCH_DIR}/include/c++/${ARM_GCC_VER}/${ARM_ARCH_DIR}/ -I/usr/${ARM_ARCH_DIR}/include/c++/${ARM_GCC_VER}/ -I/usr/${ARM_ARCH_DIR}/include/"
276+
AM_CFLAGS="$AM_CFLAGS --prefix=${ARM_LD_PATH}/ -I/usr/${ARM_ARCH_DIR}/include/c++/${ARM_GCC_VER}/${ARM_ARCH_DIR}/ -I/usr/${ARM_ARCH_DIR}/include/c++/${ARM_GCC_VER}/ -I/usr/${ARM_ARCH_DIR}/include/"
277277
fi
278278

279279
AM_CONDITIONAL([COND_GCOV],[test x"$cond_gcov" = x"yes"])

0 commit comments

Comments
 (0)