Skip to content

Commit 7b70413

Browse files
committed
Regenerate artifacts.
1 parent d95e824 commit 7b70413

File tree

3 files changed

+23
-3
lines changed

3 files changed

+23
-3
lines changed

.github/workflows/ci.yml

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

163-
- name: Failure display compiler version
163+
- name: Failure display selected compiler version
164+
if: ${{ failure() }}
165+
run: |
166+
${CC} -v
167+
${CXX} -v
168+
169+
- name: Failure display default compiler version
164170
if: ${{ failure() }}
165171
run: |
166-
gcc -v
167172
clang -v
173+
gcc -v
168174
169175
- name: Failure display env
170176
if: ${{ failure() }}

configure.ac

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

323+
# Suppress warning for copy of implicitly generated copy constructor.
324+
#------------------------------------------------------------------------------
325+
AS_CASE([${CC}], [*],
326+
[AX_CHECK_COMPILE_FLAG([-Wno-deprecated-copy],
327+
[CFLAGS="$CFLAGS -Wno-deprecated-copy"])])
328+
329+
# Suppress warning for copy of implicitly generated copy constructor.
330+
#------------------------------------------------------------------------------
331+
AS_CASE([${CC}], [*],
332+
[AX_CHECK_COMPILE_FLAG([-Wno-deprecated-copy],
333+
[CXXFLAGS="$CXXFLAGS -Wno-deprecated-copy"])])
334+
323335
# Conflict in stdlib under clang. Enabled in clang only.
324336
#------------------------------------------------------------------------------
325337
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)