Skip to content

Explicitly quote the ICU_LIB shell expansion (resolves #1130). #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 30, 2019
Merged

Explicitly quote the ICU_LIB shell expansion (resolves #1130). #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ matrix:
sources:
- sourceline: 'ppa:h-rayflood/llvm'
packages:
- clang-3.8
- clang-5.0
- os: linux
compiler: gcc
env: LINK=dynamic
Expand Down Expand Up @@ -66,7 +66,7 @@ install:

# Export CC/CXX to control compiler/version.
- if [[ $OSX && $CLANG && $STATIC ]]; then export CC=clang; export CXX=clang++; fi
- if [[ $LINUX && $CLANG && $STATIC ]]; then export CC=clang-3.8; export CXX=clang++-3.8; fi
- if [[ $LINUX && $CLANG && $STATIC ]]; then export CC=clang-5.0; export CXX=clang++-5.0; fi
- if [[ $LINUX && $GCC && $STATIC ]]; then export CC=gcc; export CXX=g++; fi
- if [[ $OSX && $CLANG && $DYNAMIC ]]; then export CC=clang; export CXX=clang++; fi
- if [[ $LINUX && $CLANG && $DYNAMIC ]]; then export CC=clang; export CXX=clang++; fi
Expand Down
2 changes: 1 addition & 1 deletion install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@ initialize_boost_icu_configuration()
BOOST_ICU_POSIX="off"

# Extract ICU libs from package config variables and augment with -ldl.
ICU_LIBS=( `pkg-config icu-i18n --libs` "-ldl" )
ICU_LIBS="`pkg-config icu-i18n --libs` -ldl"

# This is a hack for boost m4 scripts that fail with ICU dependency.
# See custom edits in ax-boost-locale.m4 and ax_boost_regex.m4.
Expand Down