Skip to content

Commit

Permalink
It's actually uname -m lying.
Browse files Browse the repository at this point in the history
  • Loading branch information
Konrad Borowski committed Jun 24, 2013
1 parent 9f34278 commit ab31e31
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion configure
View file
Expand Up @@ -203,7 +203,7 @@ CFG_CPUTYPE=$(uname -m)

if [ $CFG_OSTYPE = Darwin -a $CFG_CPUTYPE = i386 ]
then
# Darwin's `uname -s` lies and always returns i386. We have to use sysctl
# Darwin's `uname -m` lies and always returns i386. We have to use sysctl
# instead.
if sysctl hw.optional.x86_64 | grep -q ': 1'
then
Expand Down

5 comments on commit ab31e31

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from metajack
at KamilaBorowska@ab31e31

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging GlitchMr/servo/darwin-uname-m = ab31e31 into auto

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

GlitchMr/servo/darwin-uname-m = ab31e31 merged ok, testing candidate = 6df102a

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all tests pass:
http://buildbot-master-servo-01.srv.servo.releng.use1.mozilla.com:8001/builders/linux/builds/81
http://buildbot-master-servo-01.srv.servo.releng.use1.mozilla.com:8001/builders/mac/builds/35

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 6df102a

Please sign in to comment.