Skip to content
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.

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

- fix iconv detection for boost.locale on iOS #83

Merged
merged 3 commits into from
Sep 3, 2021
Merged
Changes from 2 commits
Commits
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 src/tools/gcc.jam
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ local rule compile-link-flags ( * )
local bsd = [ MATCH ^(.*bsd)$ : $(all-os) ] ;
threading-flags <target-os>$(bsd) : -pthread ;

local no-threading = android beos haiku sgi darwin vxworks ;
local no-threading = android beos haiku sgi darwin vxworks iphone appletv ;
grafikrobot marked this conversation as resolved.
Show resolved Hide resolved
local threading-generic-os = [ set.difference $(all-os) : $(no-threading) $(bsd) windows cygwin solaris qnx ] ;
threading-flags <target-os>$(threading-generic-os) : -pthread : rt ;
}
Expand Down Expand Up @@ -880,7 +880,7 @@ toolset.flags gcc.link.dll .IMPLIB-COMMAND <target-os>cygwin : "-Wl,--out-implib

# default

local generic-os = [ set.difference $(all-os) : aix darwin vxworks solaris osf hpux ] ;
local generic-os = [ set.difference $(all-os) : aix darwin vxworks solaris osf hpux iphone appletv ] ;
# Strip the binary when no debugging is needed. We use --strip-all flag
# as opposed to -s since icc (intel's compiler) is generally
# option-compatible with and inherits from the gcc toolset, but does not
Expand Down