Commit 1cf1745f authored by Dimitris Koutsogiorgas's avatar Dimitris Koutsogiorgas Committed by GitHub

Merge pull request #6775 from dnkoutso/archs_instead_of_valid_archs

`VALID_ARCHS` does not include the right archs to strip for a framework so use `ARCHS` instead
parents 86ccff79 a1935dbc
...@@ -55,6 +55,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre` ...@@ -55,6 +55,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[Dimitris Koutsogiorgas](https://github.com/dnkoutso) [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#6787](https://github.com/CocoaPods/CocoaPods/pull/6787) [#6787](https://github.com/CocoaPods/CocoaPods/pull/6787)
* `VALID_ARCHS` does not include the right archs to strip for a framework so use `ARCHS` instead
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#6774](https://github.com/CocoaPods/CocoaPods/issues/6774)
* Do not double add search paths to test xcconfig from parent * Do not double add search paths to test xcconfig from parent
[Dimitris Koutsogiorgas](https://github.com/dnkoutso) [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#6767](https://github.com/CocoaPods/CocoaPods/pull/6767) [#6767](https://github.com/CocoaPods/CocoaPods/pull/6767)
......
...@@ -122,7 +122,7 @@ module Pod ...@@ -122,7 +122,7 @@ module Pod
archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | rev)" archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | rev)"
stripped="" stripped=""
for arch in $archs; do for arch in $archs; do
if ! [[ "${VALID_ARCHS}" == *"$arch"* ]]; then if ! [[ "${ARCHS}" == *"$arch"* ]]; then
# Strip non-valid architectures in-place # Strip non-valid architectures in-place
lipo -remove "$arch" -output "$binary" "$binary" || exit 1 lipo -remove "$arch" -output "$binary" "$binary" || exit 1
stripped="$stripped $arch" stripped="$stripped $arch"
......
Subproject commit 72022b87789ec55842eabfecb7b4f9585318a54e Subproject commit 01d459b91bd1928ac5c0befe5ce9d06645a263be
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment