Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
cocoapods
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gengmeiios
cocoapods
Commits
a1935dbc
Commit
a1935dbc
authored
Jun 03, 2017
by
Dimitris Koutsogiorgas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
`VALID_ARCHS` does not include the right archs to strip for a framework so use `ARCHS` instead
parent
85b7bde0
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
2 deletions
+6
-2
CHANGELOG.md
CHANGELOG.md
+4
-0
embed_frameworks_script.rb
lib/cocoapods/generator/embed_frameworks_script.rb
+1
-1
cocoapods-integration-specs
spec/cocoapods-integration-specs
+1
-1
No files found.
CHANGELOG.md
View file @
a1935dbc
...
@@ -51,6 +51,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
...
@@ -51,6 +51,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
)
...
...
lib/cocoapods/generator/embed_frameworks_script.rb
View file @
a1935dbc
...
@@ -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"
...
...
cocoapods-integration-specs
@
01d459b9
Subproject commit
72022b87789ec55842eabfecb7b4f9585318a54
e
Subproject commit
01d459b91bd1928ac5c0befe5ce9d06645a263b
e
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment