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
0d327a0c
Commit
0d327a0c
authored
Oct 07, 2013
by
Fabio Pelosin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Analyzer] Fix non integrating architecture
parent
841407c9
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
4 deletions
+6
-4
CHANGELOG.md
CHANGELOG.md
+2
-2
analyzer.rb
lib/cocoapods/installer/analyzer.rb
+3
-1
target_installer.rb
lib/cocoapods/installer/target_installer.rb
+1
-1
No files found.
CHANGELOG.md
View file @
0d327a0c
...
...
@@ -11,8 +11,8 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
[
Fabio Pelosin
](
https://github.com/irrationalfab
)
[
#1185
](
https://github.com/CocoaPods/CocoaPods/pull/1185
)
*
Non integrating installations
now set the architecture of the Pod targets to
the
`$(ARCHS_STANDARD)`
value
.
*
Non integrating installations
for OS X targets now set the architecture of
*
the Pod targets to
`$(ARCHS_STANDARD_64_BIT)`
.
[
Fabio Pelosin
](
https://github.com/irrationalfab
)
[
#1185
](
https://github.com/CocoaPods/CocoaPods/pull/1185
)
...
...
lib/cocoapods/installer/analyzer.rb
View file @
0d327a0c
...
...
@@ -182,7 +182,9 @@ module Pod
target
.
client_root
=
config
.
installation_root
target
.
user_target_uuids
=
[]
target
.
user_build_configurations
=
{}
target
.
archs
=
'$(ARCHS_STANDARD)'
if
target_definition
.
platform
.
name
==
:osx
target
.
archs
=
'$(ARCHS_STANDARD_64_BIT)'
end
end
grouped_specs
=
specs
.
map
do
|
spec
|
...
...
lib/cocoapods/installer/target_installer.rb
View file @
0d327a0c
...
...
@@ -45,7 +45,7 @@ module Pod
settings
=
{}
if
library
.
archs
settings
[
'ARCHS'
]
=
library
.
archs
settings
[
'ARCHS'
]
=
library
.
archs
else
settings
.
delete
(
'ARCHS'
)
end
...
...
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