Skip to content

Commit 912f7a9

Browse files
committed
cleanup
1 parent 019e950 commit 912f7a9

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

.github/actions/build-gcc/action.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,22 +103,28 @@ runs:
103103
mkdir -p gccrs-build;
104104
cd gccrs-build;
105105
if [ -n "${{ inputs.use-old-gcc }}" ]; then
106+
echo "Adjusting PATH for old gcc"
106107
export PATH=$HOME/gcc-${{ inputs.use-old-gcc }}/bin:$PATH
107108
fi
108109
109110
if ${{ inputs.glibc_assertion }}; then
111+
echo "Enabling GLIBCXX assertions"
110112
export CXXFLAGS="$CXXFLAGS -D_GLIBCXX_ASSERTIONS"
111113
fi
112114
113115
if ${{ inputs.enable_multilib }}; then
116+
echo "Enabling multilib"
114117
MULTILIB_FLG=--enable-multilib
115118
else
119+
echo "Disabling multilib"
116120
MULTILIB_FLG=--disable-multilib
117121
fi
118122
119123
if ${{ inputs.bootstrap }}; then
124+
echo "Enabling bootstrap"
120125
BOOTSTRAP_FLG=--enable-bootstrap
121126
else
127+
echo "Disabling bootstrap"
122128
BOOTSTRAP_FLG=--disable-bootstrap
123129
fi
124130

.github/workflows/ccpp.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ jobs:
5151
warning_file: 'glibcxx_ubuntu64b_log_expected_warnings'
5252
glibc_assertion: true
5353
enable_multilib: false
54+
bootstrap: false
5455

5556

5657
## This is redundant with 64bit as we are doing multilib. Should build once and test both.
@@ -72,6 +73,7 @@ jobs:
7273
warning_file: 'log_expected_warnings'
7374
glibc_assertion: true
7475
enable_multilib: true
76+
bootstrap: false
7577

7678
build-and-check-gcc-5:
7779
env:
@@ -91,6 +93,7 @@ jobs:
9193
glibc_assertion: false
9294
use-old-gcc: '5.4.0'
9395
enable_multilib: false
96+
bootstrap: false
9497

9598
build-and-check-asan:
9699
env:
@@ -109,7 +112,7 @@ jobs:
109112
glibc_assertion: false
110113
enable_multilib: true
111114
extra-configure-args: "--with-build-config=../.github/no-bootstrap-asan"
112-
115+
bootstrap: false
113116

114117
# build-and-check-ubuntu-64bit-glibcxx:
115118
# env:

0 commit comments

Comments
 (0)