Skip to content

Commit 3e97b69

Browse files
committed
Testing sysroot
1 parent 95ecf84 commit 3e97b69

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

.github/workflows/builder_0_1.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
- name: script
8383
run: bash build-scripts/CI/CIBB_32b -g $GCC_VERSION -r $RPI_TYPE -o $RPIOS_TYPE
8484
shell: bash
85-
if: success() && github.event_name == 'release' && github.ref == 'BASE'
85+
if: success()
8686
- name: before_script
8787
run: bash patches/curl_stfp_patcher
8888
shell: bash
@@ -271,7 +271,7 @@ jobs:
271271
- name: script
272272
run: bash build-scripts/CI/CIBB_32b -g $GCC_VERSION -r $RPI_TYPE -o $RPIOS_TYPE
273273
shell: bash
274-
if: success() && github.event_name == 'release' && github.ref == 'BASE'
274+
if: success()
275275
- name: before_script
276276
run: bash patches/curl_stfp_patcher
277277
shell: bash

.github/workflows/builder_2_3.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
- name: script
8080
run: bash build-scripts/CI/CIBB_32b -g $GCC_VERSION -r $RPI_TYPE -o $RPIOS_TYPE
8181
shell: bash
82-
if: success() && github.event_name == 'release' && github.ref == 'BASE'
82+
if: success()
8383
- name: before_script
8484
run: bash patches/curl_stfp_patcher
8585
shell: bash
@@ -252,7 +252,7 @@ jobs:
252252
- name: script
253253
run: bash build-scripts/CI/CIBB_32b -g $GCC_VERSION -r $RPI_TYPE -o $RPIOS_TYPE
254254
shell: bash
255-
if: success() && github.event_name == 'release' && github.ref == 'BASE'
255+
if: success()
256256
- name: before_script
257257
run: bash patches/curl_stfp_patcher
258258
shell: bash

.github/workflows/builder_3_plus.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
- name: script
7979
run: bash build-scripts/CI/CIBB_32b -g $GCC_VERSION -r $RPI_TYPE -o $RPIOS_TYPE
8080
shell: bash
81-
if: success() && github.event_name == 'release' && github.ref == 'BASE'
81+
if: success()
8282
- name: before_script
8383
run: bash patches/curl_stfp_patcher
8484
shell: bash
@@ -251,7 +251,7 @@ jobs:
251251
- name: script
252252
run: bash build-scripts/CI/CIBB_32b -g $GCC_VERSION -r $RPI_TYPE -o $RPIOS_TYPE
253253
shell: bash
254-
if: success() && github.event_name == 'release' && github.ref == 'BASE'
254+
if: success()
255255
- name: before_script
256256
run: bash patches/curl_stfp_patcher
257257
shell: bash

.github/workflows/builder_64.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
- name: script
8080
run: bash build-scripts/CI/CIBB_64b -g $GCC_VERSION
8181
shell: bash
82-
if: success() && github.event_name == 'release' && github.ref == 'BASE'
82+
if: success()
8383
- name: before_script
8484
run: bash patches/curl_stfp_patcher
8585
shell: bash

build-scripts/CI/CIBB_32b

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ mkdir -p "$SYSROOTDIR"/usr/lib
199199
echo "Building binutils..."
200200
if [ -n "$(ls -A "$DOWNLOADDIR"/binutils-$BINUTILS_VERSION/build)" ]; then rm -rf "$DOWNLOADDIR"/binutils-$BINUTILS_VERSION/build/*; fi
201201
cd "$DOWNLOADDIR"/binutils-$BINUTILS_VERSION/build || exit
202-
../configure --target=$TARGET --prefix= --with-arch=$ARCH --with-fpu=$FPU --with-float=hard --disable-multilib
202+
../configure --target=$TARGET --prefix= --with-arch=$ARCH --with-fpu=$FPU --with-float=hard --with-sysroot=/$TARGET/libc --with-build-sysroot="$SYSROOTDIR" --disable-multilib
203203
make -s -j$(getconf _NPROCESSORS_ONLN)
204204
make -s install DESTDIR="$INSTALLDIR"
205205
if [ -n "$(ls -A "$DOWNLOADDIR"/binutils-$BINUTILS_VERSION/build)" ]; then rm -rf "$DOWNLOADDIR"/binutils-$BINUTILS_VERSION/build/*; fi
@@ -213,7 +213,7 @@ make -s -j$(getconf _NPROCESSORS_ONLN) all-gcc
213213
make -s install-gcc DESTDIR="$INSTALLDIR"
214214
if [ -n "$(ls -A "$DOWNLOADDIR"/glibc-$GLIBC_VERSION/build)" ]; then rm -rf "$DOWNLOADDIR"/glibc-$GLIBC_VERSION/build/*; fi
215215
cd "$DOWNLOADDIR"/glibc-$GLIBC_VERSION/build || exit
216-
../configure --prefix=/usr --build="$MACHTYPE" --host=$TARGET --target=$TARGET --with-arch=$ARCH --with-fpu=$FPU --with-float=hard --with-headers="$SYSROOTDIR"/usr/include --with-lib="$SYSROOTDIR"/usr/lib --disable-multilib libc_cv_forced_unwind=yes
216+
../configure --prefix=/usr --build="$MACHTYPE" --host=$TARGET --target=$TARGET --with-arch=$ARCH --with-fpu=$FPU --with-float=hard --with-sysroot=/$TARGET/libc --with-build-sysroot="$SYSROOTDIR" --with-headers="$SYSROOTDIR"/usr/include --with-lib="$SYSROOTDIR"/usr/lib --disable-multilib libc_cv_forced_unwind=yes
217217
make -s install-bootstrap-headers=yes install-headers DESTDIR="$SYSROOTDIR"
218218
make -s -j$(getconf _NPROCESSORS_ONLN) csu/subdir_lib
219219
install csu/crt1.o csu/crti.o csu/crtn.o "$SYSROOTDIR"/usr/lib

build-scripts/CI/CIBB_64b

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ mkdir -p "$SYSROOTDIR"/usr/lib
188188
echo "Building binutils..."
189189
if [ -n "$(ls -A "$DOWNLOADDIR"/binutils-$BINUTILS_VERSION/build)" ]; then rm -rf "$DOWNLOADDIR"/binutils-$BINUTILS_VERSION/build/*; fi
190190
cd "$DOWNLOADDIR"/binutils-$BINUTILS_VERSION/build || exit
191-
../configure --target=$TARGET --prefix= --with-arch=$ARCH --disable-multilib
191+
../configure --target=$TARGET --prefix= --with-arch=$ARCH --with-sysroot=/$TARGET/libc --with-build-sysroot="$SYSROOTDIR" --disable-multilib
192192
make -s -j$(getconf _NPROCESSORS_ONLN)
193193
make -s install DESTDIR="$INSTALLDIR"
194194
if [ -n "$(ls -A "$DOWNLOADDIR"/binutils-$BINUTILS_VERSION/build)" ]; then rm -rf "$DOWNLOADDIR"/binutils-$BINUTILS_VERSION/build/*; fi
@@ -202,7 +202,7 @@ make -s -j$(getconf _NPROCESSORS_ONLN) all-gcc
202202
make -s install-gcc DESTDIR="$INSTALLDIR"
203203
if [ -n "$(ls -A "$DOWNLOADDIR"/glibc-$GLIBC_VERSION/build)" ]; then rm -rf "$DOWNLOADDIR"/glibc-$GLIBC_VERSION/build/*; fi
204204
cd "$DOWNLOADDIR"/glibc-$GLIBC_VERSION/build || exit
205-
../configure --prefix=/usr --build="$MACHTYPE" --host=$TARGET --target=$TARGET --with-arch=$ARCH --with-headers="$SYSROOTDIR"/usr/include --with-lib="$SYSROOTDIR"/usr/lib --disable-multilib libc_cv_forced_unwind=yes
205+
../configure --prefix=/usr --build="$MACHTYPE" --host=$TARGET --target=$TARGET --with-arch=$ARCH --with-sysroot=/$TARGET/libc --with-build-sysroot="$SYSROOTDIR" --with-headers="$SYSROOTDIR"/usr/include --with-lib="$SYSROOTDIR"/usr/lib --disable-multilib libc_cv_forced_unwind=yes
206206
make -s install-bootstrap-headers=yes install-headers DESTDIR="$SYSROOTDIR"
207207
make -s -j$(getconf _NPROCESSORS_ONLN) csu/subdir_lib
208208
install csu/crt1.o csu/crti.o csu/crtn.o "$SYSROOTDIR"/usr/lib

0 commit comments

Comments
 (0)