Skip to content

Commit bf26336

Browse files
committed
Fix avr-libc if cross compiling
1 parent f39f7f9 commit bf26336

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

avr-libc.build.bash

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,13 @@ cd objdir
7474
PREFIX=`pwd`
7575
cd -
7676

77+
export OLDPATH="$PATH"
78+
79+
# Add to path only if we are not cross compiling
80+
if [[ x$CROSS_COMPILE == "x" ]]; then
81+
export PATH="$PREFIX/bin:$PATH"
82+
fi
83+
7784
mkdir -p avr-libc-build
7885
cd avr-libc-build
7986

@@ -84,13 +91,14 @@ CONFARGS=" \
8491
--libdir=$PREFIX/lib \
8592
--disable-doc"
8693

87-
PATH=$PREFIX/bin:$PATH CC="avr-gcc" CXX="avr-g++" CFLAGS="-w -Os $CFLAGS" CXXFLAGS="-w -Os $CXXFLAGS" LDFLAGS="-s $LDFLAGS" ../avr-libc/configure $CONFARGS
94+
CC="avr-gcc" CXX="avr-g++" CFLAGS="-w -Os $CFLAGS" CXXFLAGS="-w -Os $CXXFLAGS" LDFLAGS="-s $LDFLAGS" ../avr-libc/configure $CONFARGS
8895

8996
if [ -z "$MAKE_JOBS" ]; then
9097
MAKE_JOBS="2"
9198
fi
9299

93-
PATH=$PREFIX/bin:$PATH nice -n 10 make -j $MAKE_JOBS
100+
nice -n 10 make -j $MAKE_JOBS
94101

95-
PATH=$PREFIX/bin:$PATH make install
102+
make install
96103

104+
export PATH="$OLDPATH"

0 commit comments

Comments
 (0)