Skip to content

Commit

Permalink
Do not warn for missing arch if is set to .
Browse files Browse the repository at this point in the history
  • Loading branch information
dnkoutso committed Oct 2, 2020
1 parent 418dc1f commit fd0b82e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ To install release candidates run `[sudo] gem install cocoapods --pre`

##### Bug Fixes

* None.
* Do not warn for missing arch if `$ONLY_ACTIVE_ARCH` is set to `NO`.
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#10076](https://github.com/CocoaPods/CocoaPods/issues/10076)


## 1.10.0.rc.1 (2020-09-15)
Expand Down
2 changes: 1 addition & 1 deletion lib/cocoapods/generator/script_phase_constants.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ module ScriptPhaseConstants
intersected_archs="$(echo ${ARCHS[@]} ${binary_archs[@]} | tr ' ' '\\n' | sort | uniq -d)"
# If there are no archs supported by this binary then warn the user
if [[ -z "$intersected_archs" ]]; then
if [[ "$warn_missing_arch" == "true" ]]; then
if [[ "$warn_missing_arch" == "true" ]] && [[ "$ONLY_ACTIVE_ARCH" == "NO" ]]; then
echo "warning: [CP] Vendored binary '$binary' contains architectures ($binary_archs) none of which match the current build architectures ($ARCHS)."
fi
STRIP_BINARY_RETVAL=1
Expand Down
2 changes: 1 addition & 1 deletion spec/cocoapods-integration-specs

0 comments on commit fd0b82e

Please sign in to comment.