Skip to content

Commit 666e191

Browse files
committed
Remove darwin version in Darwin*NativeConfiguration to avoid confusion
* Since that is the version that CRuby was built on, which might differ from the OS version in use in CI.
1 parent 9b2cc0b commit 666e191

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/main/java/org/truffleruby/platform/DarwinAArch64NativeConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
public final class DarwinAArch64NativeConfiguration extends DefaultNativeConfiguration {
4343

4444
public static void load(NativeConfiguration configuration, RubyContext context) {
45-
// Generated from tool/generate-native-config.rb on arm64-darwin20
45+
// Generated from tool/generate-native-config.rb on arm64-darwin
4646
configuration.config("platform.sigaction.sizeof", 16);
4747
configuration.config("platform.sigaction.sa_handler.offset", 0);
4848
configuration.config("platform.sigaction.sa_handler.size", 8);

src/main/java/org/truffleruby/platform/DarwinAMD64NativeConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
public final class DarwinAMD64NativeConfiguration extends DefaultNativeConfiguration {
4343

4444
public static void load(NativeConfiguration configuration, RubyContext context) {
45-
// Generated from tool/generate-native-config.rb on x86_64-darwin18
45+
// Generated from tool/generate-native-config.rb on x86_64-darwin
4646
configuration.config("platform.sigaction.sizeof", 16);
4747
configuration.config("platform.sigaction.sa_handler.offset", 0);
4848
configuration.config("platform.sigaction.sa_handler.size", 8);

tool/generate-native-config.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ def initialize
8585

8686
@file = File.open(java_file, 'wb')
8787
@file.puts contents[0...from+METHOD_START.length]
88-
@file.puts "#{INDENT}// Generated from #{SCRIPT} on #{RUBY_PLATFORM}"
88+
@file.puts "#{INDENT}// Generated from #{SCRIPT} on #{RUBY_PLATFORM.sub(/darwin\d+/, 'darwin')}"
8989
at_exit do
9090
@file.puts contents[to..-1]
9191
@file.close

0 commit comments

Comments
 (0)