Skip to content

Commit a92527e

Browse files
committed
Regenerate artifacts.
1 parent fdd7631 commit a92527e

3 files changed

Lines changed: 23 additions & 3 deletions

File tree

.github/workflows/ci.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,11 +153,17 @@ jobs:
153153
path-to-lcov: "./coverage.info"
154154
github-token: ${{ secrets.github_token }}
155155

156-
- name: Failure display compiler version
156+
- name: Failure display selected compiler version
157+
if: ${{ failure() }}
158+
run: |
159+
${CC} -v
160+
${CXX} -v
161+
162+
- name: Failure display default compiler version
157163
if: ${{ failure() }}
158164
run: |
159-
gcc -v
160165
clang -v
166+
gcc -v
161167
162168
- name: Failure display env
163169
if: ${{ failure() }}

configure.ac

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,18 @@ AS_CASE([${CC}], [*],
386386
[AX_CHECK_COMPILE_FLAG([-Wno-comment],
387387
[CXXFLAGS="$CXXFLAGS -Wno-comment"])])
388388

389+
# Suppress warning for copy of implicitly generated copy constructor.
390+
#------------------------------------------------------------------------------
391+
AS_CASE([${CC}], [*],
392+
[AX_CHECK_COMPILE_FLAG([-Wno-deprecated-copy],
393+
[CFLAGS="$CFLAGS -Wno-deprecated-copy"])])
394+
395+
# Suppress warning for copy of implicitly generated copy constructor.
396+
#------------------------------------------------------------------------------
397+
AS_CASE([${CC}], [*],
398+
[AX_CHECK_COMPILE_FLAG([-Wno-deprecated-copy],
399+
[CXXFLAGS="$CXXFLAGS -Wno-deprecated-copy"])])
400+
389401
# Conflict in stdlib under clang. Enabled in clang only.
390402
#------------------------------------------------------------------------------
391403
AS_CASE([${CC}], [*clang*],

install.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,6 +406,9 @@ build_from_tarball()
406406
local OPTIONS=$7
407407
shift 7
408408

409+
local SAVE_LDFLAGS="$LDFLAGS"
410+
local SAVE_CPPFLAGS="$CPPFLAGS"
411+
409412
# For some platforms we need to set ICU pkg-config path.
410413
if [[ ! ($BUILD) ]]; then
411414
if [[ $ARCHIVE == "$ICU_ARCHIVE" ]]; then
@@ -416,7 +419,6 @@ build_from_tarball()
416419

417420
# Because ICU tools don't know how to locate internal dependencies.
418421
if [[ ($ARCHIVE == "$ICU_ARCHIVE") ]]; then
419-
local SAVE_LDFLAGS="$LDFLAGS"
420422
export LDFLAGS="-L$PREFIX/lib $LDFLAGS"
421423
fi
422424

0 commit comments

Comments
 (0)