Skip to content

Commit 9535222

Browse files
committed
wip: checkpoint rbspy
1 parent 9376b30 commit 9535222

File tree

6 files changed

+169
-126
lines changed

6 files changed

+169
-126
lines changed

pyroscope_ffi/ruby/Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: .
33
specs:
4-
pyroscope_beta (0.1.4)
4+
pyroscope_beta (0.1.5)
55
ffi (~> 1.9)
66
fiddle (~> 1.1)
77

pyroscope_ffi/ruby/Rakefile

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,6 @@ namespace :gem do
7474
RakeCompilerDock.sh <<-EOT, platform: platform, image: "rbsys/rcd:#{platform}"
7575
set -e
7676
77-
# For cross-building ring; see https://github.com/briansmith/ring/blob/main/BUILDING.md#cross-compiling
78-
#apt-get update
79-
#apt-get install -y libssl-dev
80-
8177
if [ -d "/opt/osxcross/target/bin" ]; then
8278
# This string replacement is a workaround for https://github.com/oxidize-rb/rb-sys/pull/23
8379
TARGET_CC="${CARGO_BUILD_TARGET/darwin/darwin20.2}-cc"
@@ -88,6 +84,7 @@ namespace :gem do
8884
fi
8985
export TARGET_CC TARGET_AR
9086
export GVB_VERSION_OVERRIDE="#{spec.version}"
87+
[[ "#{platform}" =~ ^a ]] && apt-get update && apt-get install -y libssl-dev
9188
[[ "#{platform}" =~ ^a ]] && rustup default nightly
9289
# This re-installs the nightly version of the relevant target after
9390
# we so rudely switch the default toolchain
@@ -107,7 +104,7 @@ namespace :gem do
107104
task platform => :prepare do
108105
RakeCompilerDock.sh <<-EOT, platform: platform, image: "rbsys/rcd:#{platform}"
109106
set -e
110-
# For cross-building ring; see https://github.com/briansmith/ring/blob/main/BUILDING.md#cross-compiling
107+
111108
#apt-get update
112109
#apt-get install -y libssl-dev
113110
@@ -121,6 +118,7 @@ namespace :gem do
121118
fi
122119
export TARGET_CC TARGET_AR
123120
export GVB_VERSION_OVERRIDE="#{spec.version}"
121+
[[ "#{platform}" =~ ^a ]] && apt-get update && apt-get install -y libssl-dev
124122
[[ "#{platform}" =~ ^a ]] && rustup default nightly
125123
# This re-installs the nightly version of the relevant target after
126124
# we so rudely switch the default toolchain

0 commit comments

Comments
 (0)