Skip to content

Commit 8186db9

Browse files
committed
[GR-47781] Avoid rebuilding TRUFFLERUBY_GRAALVM_SUPPORT_PLATFORM_AGNOSTIC on consecutive mx build
PullRequest: truffleruby/3974 (cherry picked from commit 3cc5b70)
1 parent 9320d45 commit 8186db9

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

mx.truffleruby/suite.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -417,6 +417,8 @@
417417
"src/main/c/ripper/<extsuffix:ripper>",
418418
"src/main/c/syslog/<extsuffix:syslog>",
419419
"src/main/c/zlib/<extsuffix:zlib>",
420+
"lib/gems/gems/debug-1.7.1/lib/debug/<extsuffix:debug>",
421+
"lib/gems/gems/rbs-2.8.2/lib/<extsuffix:rbs_extension>",
420422
],
421423
"license": [
422424
"EPL-2.0", # JRuby (we're choosing EPL out of EPL,GPL,LGPL)
@@ -643,6 +645,11 @@
643645
"fileListPurpose": 'native-image-resources',
644646
"native": True,
645647
"platformDependent": False,
648+
# The project org.truffleruby.cext touches lib/gems/gems/debug-1.7.1/ext
649+
# and lib/gems/extensions/$ARCH-$OS/$ABI/rbs-2.8.2/gem.build_complete.
650+
# This causes this layout distribution to be rebuilt even though nothing changes in the result.
651+
# To avoid that we force org.truffleruby.cext to complete first.
652+
"dependencies": ["org.truffleruby.cext"],
646653
"layout": {
647654
"lib/": [
648655
"file:lib/json",
@@ -700,8 +707,8 @@
700707
],
701708
# The platform-specific files from debug and rbs, see comment above
702709
"lib/gems/": "file:lib/gems/extensions",
703-
"lib/gems/gems/debug-1.7.1/lib/debug/": "file:lib/gems/gems/debug-1.7.1/lib/debug/<extsuffix:debug>",
704-
"lib/gems/gems/rbs-2.8.2/lib/": "file:lib/gems/gems/rbs-2.8.2/lib/<extsuffix:rbs_extension>",
710+
"lib/gems/gems/debug-1.7.1/lib/debug/": "dependency:org.truffleruby.cext/lib/gems/gems/debug-1.7.1/lib/debug/<extsuffix:debug>",
711+
"lib/gems/gems/rbs-2.8.2/lib/": "dependency:org.truffleruby.cext/lib/gems/gems/rbs-2.8.2/lib/<extsuffix:rbs_extension>",
705712
"lib/mri/": [
706713
"dependency:org.truffleruby.cext/src/main/c/bigdecimal/<extsuffix:bigdecimal>",
707714
"dependency:org.truffleruby.cext/src/main/c/date/<extsuffix:date_core>",

0 commit comments

Comments
 (0)