Skip to content

Commit 12d18be

Browse files
committed
Regenerate artifacts.
1 parent e3d6010 commit 12d18be

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
@@ -167,11 +167,17 @@ jobs:
167167
path-to-lcov: "./coverage.info"
168168
github-token: ${{ secrets.github_token }}
169169

170-
- name: Failure display compiler version
170+
- name: Failure display selected compiler version
171+
if: ${{ failure() }}
172+
run: |
173+
${CC} -v
174+
${CXX} -v
175+
176+
- name: Failure display default compiler version
171177
if: ${{ failure() }}
172178
run: |
173-
gcc -v
174179
clang -v
180+
gcc -v
175181
176182
- name: Failure display env
177183
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
@@ -415,6 +415,9 @@ build_from_tarball()
415415
local OPTIONS=$7
416416
shift 7
417417

418+
local SAVE_LDFLAGS="$LDFLAGS"
419+
local SAVE_CPPFLAGS="$CPPFLAGS"
420+
418421
# For some platforms we need to set ICU pkg-config path.
419422
if [[ ! ($BUILD) ]]; then
420423
if [[ $ARCHIVE == "$ICU_ARCHIVE" ]]; then
@@ -425,7 +428,6 @@ build_from_tarball()
425428

426429
# Because ICU tools don't know how to locate internal dependencies.
427430
if [[ ($ARCHIVE == "$ICU_ARCHIVE") ]]; then
428-
local SAVE_LDFLAGS="$LDFLAGS"
429431
export LDFLAGS="-L$PREFIX/lib $LDFLAGS"
430432
fi
431433

0 commit comments

Comments
 (0)