Skip to content

Commit 9165c28

Browse files
committed
restore building of crtls and rules files
1 parent 116613a commit 9165c28

File tree

3 files changed

+51
-3
lines changed

3 files changed

+51
-3
lines changed

build-devkit.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,15 +219,18 @@ extract_and_patch gcc $GCC_VER xz
219219
extract_and_patch newlib $NEWLIB_VER gz
220220
extract_and_patch gdb $GDB_VER xz
221221

222-
if [ $VERSION -eq 2 ]; then
223-
extract_and_patch binutils $MN_BINUTILS_VER bz2
224-
fi
222+
if [ $VERSION -eq 2 ]; then extract_and_patch binutils $MN_BINUTILS_VER bz2; fi
225223

226224
#---------------------------------------------------------------------------------
227225
# Build and install devkit components
228226
#---------------------------------------------------------------------------------
229227
if [ -f $scriptdir/build-gcc.sh ]; then . $scriptdir/build-gcc.sh || { echo "Error building toolchain"; exit 1; }; cd $BUILDSCRIPTDIR; fi
230228

229+
230+
if [ "$BUILD_DKPRO_SKIP_CRTLS" != "1" ] && [ -f $scriptdir/build-crtls.sh ]; then
231+
. $scriptdir/build-crtls.sh || { echo "Error building crtls & rules"; exit 1; }; cd $BUILDSCRIPTDIR;
232+
fi
233+
231234
cd $BUILDSCRIPTDIR
232235

233236
if [ ! -z $CROSSBUILD ] && grep -q "mingw" <<<"$CROSSBUILD" ; then

dkarm-eabi/scripts/build-crtls.sh

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
#!/bin/sh
2+
3+
#---------------------------------------------------------------------------------
4+
# set env variables
5+
#---------------------------------------------------------------------------------
6+
export DEVKITPRO=$TOOLPATH
7+
export DEVKITARM=$DEVKITPRO/devkitARM
8+
9+
#---------------------------------------------------------------------------------
10+
# Install the rules files
11+
#---------------------------------------------------------------------------------
12+
cd $BUILDDIR
13+
14+
mkdir -p rules
15+
cd rules
16+
tar -xvf $SRCDIR/devkitarm-rules-$DKARM_RULES_VER.tar.xz
17+
make install
18+
19+
#---------------------------------------------------------------------------------
20+
# Install and build the crt0 files
21+
#---------------------------------------------------------------------------------
22+
cd $BUILDDIR
23+
24+
mkdir -p crtls
25+
cd crtls
26+
tar -xvf $SRCDIR/devkitarm-crtls-$DKARM_CRTLS_VER.tar.xz
27+
make install
28+

dkppc/scripts/build-crtls.sh

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#!/bin/sh
2+
3+
#---------------------------------------------------------------------------------
4+
# set env variables
5+
#---------------------------------------------------------------------------------
6+
export DEVKITPRO=$TOOLPATH
7+
export DEVKITARM=$DEVKITPRO/devkitARM
8+
9+
#---------------------------------------------------------------------------------
10+
# Install the rules files
11+
#---------------------------------------------------------------------------------
12+
cd $BUILDDIR
13+
14+
mkdir -p rules
15+
cd rules
16+
tar -xvf $SRCDIR/devkitarm-rules-$DKARM_RULES_VER.tar.xz
17+
make install

0 commit comments

Comments
 (0)