Skip to content

Commit 98c7b09

Browse files
committed
Fixed architecture check.
Need to find a better solution one day; order shouldn't matter.
1 parent a5dc96c commit 98c7b09

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

Tools/build.rb

+3-4
Original file line numberDiff line numberDiff line change
@@ -117,15 +117,14 @@ def sanityCheck
117117
@worker.run("lipo -info #{osxproductdir}/OCMock.framework/OCMock") { |lipo| archs = /re: (.*)/.match(lipo.readline)[1].strip() }
118118
puts "^^ wrong architecture for macOS framework; found: #{archs}\n\n" unless archs == "x86_64"
119119
@worker.run("lipo -info #{ioslibproductdir}/libOCMock.a") { |lipo| archs = /re: (.*)/.match(lipo.readline)[1].strip() }
120-
puts "^^ wrong architectures for iOS framework; found: #{archs}\n\n" unless archs == "armv7 i386 x86_64 arm64"
120+
puts "^^ wrong architectures for iOS library; found: #{archs}\n\n" unless archs == "armv7 i386 x86_64 arm64"
121121
@worker.run("lipo -info #{iosproductdir}/OCMock.framework/OCMock") { |lipo| archs = /re: (.*)/.match(lipo.readline)[1].strip() }
122-
puts "^^ wrong architectures for iOS library; found: #{archs}\n\n" unless archs == "i386 x86_64 armv7 arm64"
122+
puts "^^ wrong architectures for iOS framework; found: #{archs}\n\n" unless archs == "x86_64 i386 armv7 arm64"
123123
@worker.run("lipo -info #{tvosproductdir}/OCMock.framework/OCMock") { |lipo| archs = /re: (.*)/.match(lipo.readline)[1].strip() }
124124
puts "^^ wrong architectures for tvOS framework; found: #{archs}\n\n" unless archs == "x86_64 arm64"
125125
@worker.run("lipo -info #{watchosproductdir}/OCMock.framework/OCMock") { |lipo| archs = /re: (.*)/.match(lipo.readline)[1].strip() }
126-
puts "^^ wrong architectures for watchOS framework; found: #{archs}\n\n" unless archs == "i386 x86_64 armv7k arm64_32"
126+
puts "^^ wrong architectures for watchOS framework; found: #{archs}\n\n" unless archs == "x86_64 i386 armv7k arm64_32"
127127

128-
129128
@worker.run("codesign -dvv #{osxproductdir}/OCMock.framework")
130129
@worker.run("codesign -dvv #{iosproductdir}/OCMock.framework")
131130
@worker.run("codesign -dvv #{tvosproductdir}/OCMock.framework")

0 commit comments

Comments
 (0)