Skip to content

Commit

Permalink
Regenerate artifacts.
Browse files Browse the repository at this point in the history
  • Loading branch information
pmienk committed May 28, 2022
1 parent 05336f7 commit 681093c
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 4 deletions.
10 changes: 8 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -160,11 +160,17 @@ jobs:
path-to-lcov: "./coverage.info"
github-token: ${{ secrets.github_token }}

- name: Failure display compiler version
- name: Failure display selected compiler version
if: ${{ failure() }}
run: |
${CC} -v
${CXX} -v
- name: Failure display default compiler version
if: ${{ failure() }}
run: |
gcc -v
clang -v
gcc -v
- name: Failure display env
if: ${{ failure() }}
Expand Down
12 changes: 12 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,18 @@ AS_CASE([${CC}], [*],
[AX_CHECK_COMPILE_FLAG([-Wno-comment],
[CXXFLAGS="$CXXFLAGS -Wno-comment"])])

# Suppress warning for copy of implicitly generated copy constructor.
#------------------------------------------------------------------------------
AS_CASE([${CC}], [*],
[AX_CHECK_COMPILE_FLAG([-Wno-deprecated-copy],
[CFLAGS="$CFLAGS -Wno-deprecated-copy"])])

# Suppress warning for copy of implicitly generated copy constructor.
#------------------------------------------------------------------------------
AS_CASE([${CC}], [*],
[AX_CHECK_COMPILE_FLAG([-Wno-deprecated-copy],
[CXXFLAGS="$CXXFLAGS -Wno-deprecated-copy"])])

# Conflict in stdlib under clang. Enabled in clang only.
#------------------------------------------------------------------------------
AS_CASE([${CC}], [*clang*],
Expand Down
6 changes: 4 additions & 2 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,9 @@ build_from_tarball()
local OPTIONS=$7
shift 7

local SAVE_LDFLAGS="$LDFLAGS"
local SAVE_CPPFLAGS="$CPPFLAGS"

# For some platforms we need to set ICU pkg-config path.
if [[ ! ($BUILD) ]]; then
if [[ $ARCHIVE == "$ICU_ARCHIVE" ]]; then
Expand All @@ -425,8 +428,7 @@ build_from_tarball()

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

display_heading_message "Download $ARCHIVE"
Expand Down

0 comments on commit 681093c

Please sign in to comment.