Skip to content

Commit

Permalink
android workaround
Browse files Browse the repository at this point in the history
  • Loading branch information
thestinger committed May 11, 2014
1 parent e2479b8 commit 81fadbb
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/libstd/rt/heap.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ extern {
}

// -lpthread needs to occur after -ljemalloc, the earlier argument isn't enough
#[cfg(not(windows))]
#[cfg(not(windows), not(target_os = "android"))]
#[link(name = "pthread")]
extern {}

Expand Down

9 comments on commit 81fadbb

@bors
Copy link
Contributor

@bors bors commented on 81fadbb May 11, 2014

Choose a reason for hiding this comment

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

@bors
Copy link
Contributor

@bors bors commented on 81fadbb May 11, 2014

Choose a reason for hiding this comment

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

merging thestinger/rust/jemalloc = 81fadbb into auto

@bors
Copy link
Contributor

@bors bors commented on 81fadbb May 11, 2014

Choose a reason for hiding this comment

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

thestinger/rust/jemalloc = 81fadbb merged ok, testing candidate = f26aacc0

@bors
Copy link
Contributor

@bors bors commented on 81fadbb May 11, 2014

Choose a reason for hiding this comment

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

@bors
Copy link
Contributor

@bors bors commented on 81fadbb May 11, 2014

Choose a reason for hiding this comment

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

@bors
Copy link
Contributor

@bors bors commented on 81fadbb May 11, 2014

Choose a reason for hiding this comment

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

merging thestinger/rust/jemalloc = 81fadbb into auto

@bors
Copy link
Contributor

@bors bors commented on 81fadbb May 11, 2014

Choose a reason for hiding this comment

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

thestinger/rust/jemalloc = 81fadbb merged ok, testing candidate = adb8b0b

@bors
Copy link
Contributor

@bors bors commented on 81fadbb May 11, 2014

@bors
Copy link
Contributor

@bors bors commented on 81fadbb May 11, 2014

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 = adb8b0b

Please sign in to comment.