From 21e75f5188991fa80bb22af800831a0c8c04d6e4 Mon Sep 17 00:00:00 2001 From: Marius Bakke <marius@gnu.org> Date: Mon, 19 Jul 2021 13:57:54 +0200 Subject: build-system/cmake: Define '%build-inputs' when cross-compiling. * guix/build-system/cmake.scm (cmake-cross-build)[builder]: Define '%build-inputs' as it existed before 7d873f194ca69d6096d28d7a224ab78e83e34fe1. --- guix/build-system/cmake.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/guix/build-system/cmake.scm b/guix/build-system/cmake.scm index 2f9689b07c..d500eccfde 100644 --- a/guix/build-system/cmake.scm +++ b/guix/build-system/cmake.scm @@ -210,6 +210,9 @@ build system." (append #$(input-tuples->gexp host-inputs) #+(input-tuples->gexp target-inputs))) + (define %build-inputs + (append %build-host-inputs %build-target-inputs)) + (define %outputs #$(outputs->gexp outputs)) -- cgit v1.2.3 select> <input type='submit' value='switch'/></form></td></tr> <tr><td class='sub'>Wojtek's customized Guix</td><td class='sub right'></td></tr></table> <table class='tabs'><tr><td> <a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=54f37657408ca06640472206146f3df6f3128fab'>refs</a><a class='active' href='/guix/log/gnu/ci.scm'>log</a><a href='/guix/tree/gnu/ci.scm?id=54f37657408ca06640472206146f3df6f3128fab'>tree</a><a href='/guix/commit/gnu/ci.scm?id=54f37657408ca06640472206146f3df6f3128fab'>commit</a><a href='/guix/diff/gnu/ci.scm?id=54f37657408ca06640472206146f3df6f3128fab'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/ci.scm'> <input type='hidden' name='id' value='54f37657408ca06640472206146f3df6f3128fab'/><select name='qt'> <option value='grep'>log msg</option> <option value='author'>author</option> <option value='committer'>committer</option> <option value='range'>range</option> </select> <input class='txt' type='search' size='10' name='q' value=''/> <input type='submit' value='search'/> </form> </td></tr></table> <div class='path'>path: <a href='/guix/log/?id=54f37657408ca06640472206146f3df6f3128fab'>root</a>/<a href='/guix/log/gnu?id=54f37657408ca06640472206146f3df6f3128fab'>gnu</a>/<a href='/guix/log/gnu/ci.scm?id=54f37657408ca06640472206146f3df6f3128fab'>ci.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/ci.scm?id=54f37657408ca06640472206146f3df6f3128fab&showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr> <tr><td><span title='2024-07-10 18:57:44 +0300'>2024-07-10</span></td><td><a href='/guix/commit/gnu/ci.scm?id=e99c838d4f87d6403355bb7b38695e1bc8f697f6'>gnu: ci: Cross-build for fewer platforms.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/ci.scm (%unsupported-platform-triplets): New variable. (cross-jobs): Also don't build for systems listed in %unsupported-platform-triplets. Change-Id: Ic31ae6d307f2d243c098ec050bdb9d09060466ac </span></span></td><td>Efraim Flashner</td></tr> <tr><td><span title='2024-06-13 08:53:20 +0200'>2024-06-13</span></td><td><a href='/guix/commit/gnu/ci.scm?id=a636bd3bebd078deacdb5bb500f07d25bd364daa'>ci: Add cross-compilation jobs for x86_64-linux-gnux32.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/ci.scm (cross-jobs)[same?]: Special case x86_64-linux-gnux32. Change-Id: I877eb50d6b0b0bf10474c58f8e9d5ee92f1705d2 </span></span></td><td>Ludovic Courtès</td></tr> <tr><td><span title='2024-05-31 20:04:51 +0800'>2024-05-31</span></td><td><a href='/guix/commit/gnu/ci.scm?id=83d29d56f8808ca1f076dda37ef34150d0308e9a'>ci: Build visionfive2-barebones-raw-image.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/ci.scm (%guix-system-images): Add visionfive2-barebones-raw-image. Change-Id: I0a0edccf00119d6b23b864bb0123be6ca7b01d34 Signed-off-by: Zheng Junjie <zhengjunjie@iscas.ac.cn> </span></span></td><td>Zheng Junjie</td></tr> <tr><td><span title='2024-04-17 17:29:58 +0200'>2024-04-17</span></td><td><a href='/guix/commit/gnu/ci.scm?id=7bed290fdfd830d690daf065de6d2ecab73309d9'>ci: Don’t cross-compile to xtensa-ath9k-elf.</a><span class='msg-avail'>...<span class='msg-tooltip'>This is a followup to 9a60894156c3ea2c609ae0cd787df949f2d6ecc2. * gnu/ci.scm (%bare-platform-triplets): New variable. (cross-jobs)[pointless?]: Use it. Change-Id: I4701bc402bb93d372d46b7208697e0f998a1dc62 </span></span></td><td>Ludovic Courtès</td></tr>