Skip to content

Commit c808eda

Browse files
committed
nits: Move generate_ldflags Util
1 parent b636741 commit c808eda

File tree

4 files changed

+17
-18
lines changed

4 files changed

+17
-18
lines changed

_gem/lib/go_gem/rake_task.rb

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ def initialize(gem_name)
9999
#
100100
# @return [Hash<String, String>]
101101
def self.build_env_vars
102-
ldflags = generate_ldflags
102+
ldflags = GoGem::Util.generate_ldflags
103103
cflags = generate_cflags
104104

105105
# FIXME: Workaround for Ubuntu (GitHub Actions)
@@ -132,21 +132,6 @@ def self.generate_goflags
132132
end
133133
private_class_method :generate_goflags
134134

135-
# @return [String]
136-
def self.generate_ldflags
137-
ldflags = "-L#{RbConfig::CONFIG["libdir"]} -l#{RbConfig::CONFIG["RUBY_SO_NAME"]}"
138-
139-
case `#{RbConfig::CONFIG["CC"]} --version` # rubocop:disable Lint/LiteralAsCondition
140-
when /Free Software Foundation/
141-
ldflags << " -Wl,--unresolved-symbols=ignore-all"
142-
when /clang/
143-
ldflags << " -undefined dynamic_lookup"
144-
end
145-
146-
ldflags
147-
end
148-
private_class_method :generate_ldflags
149-
150135
# @return [String]
151136
def self.generate_cflags
152137
[

_gem/lib/go_gem/util.rb

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,19 @@ module Util
1414
def self.ruby_minor_version_build_tag(ruby_version = RUBY_VERSION)
1515
"ruby_#{ruby_version.to_f.to_s.gsub(".", "_")}"
1616
end
17+
18+
# @return [String]
19+
def self.generate_ldflags
20+
ldflags = "-L#{RbConfig::CONFIG["libdir"]} -l#{RbConfig::CONFIG["RUBY_SO_NAME"]}"
21+
22+
case `#{RbConfig::CONFIG["CC"]} --version` # rubocop:disable Lint/LiteralAsCondition
23+
when /Free Software Foundation/
24+
ldflags << " -Wl,--unresolved-symbols=ignore-all"
25+
when /clang/
26+
ldflags << " -undefined dynamic_lookup"
27+
end
28+
29+
ldflags
30+
end
1731
end
1832
end

_gem/sig/go_gem/rake_task.rbs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ module GoGem
3232

3333
def self.generate_goflags: () -> String
3434

35-
def self.generate_ldflags: () -> String
36-
3735
def self.generate_cflags: () -> String
3836

3937
private

_gem/sig/go_gem/util.rbs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
module GoGem
22
module Util
33
def self.ruby_minor_version_build_tag: (?String ruby_version) -> String
4+
5+
def self.generate_ldflags: () -> String
46
end
57
end

0 commit comments

Comments
 (0)