Use 'uname -m', which in practice returns the processor architecture. --- psm-3.3/buildflags.mak~ 2014-08-20 21:00:18.000000000 +0100 +++ psm-3.3/buildflags.mak 2017-10-22 12:02:12.855291447 +0100 @@ -38,7 +38,7 @@ endif export os ?= $(shell uname -s | tr '[A-Z]' '[a-z]') -export arch := $(shell uname -p | sed -e 's,\(i[456]86\|athlon$$\),i386,') +export arch := $(shell uname -m | sed -e 's,\(i[456]86\|athlon$$\),i386,') CC ?= gcc ttps://git.koszko.org/cgit-static/cgit.png' alt='cgit logo'/> index : guix
Wojtek's customized Guix
aboutsummaryrefslogtreecommitdiff
path: root/tests/build-utils.scm
AgeCommit message (Expand)Author
2019-11-26tests: Avoid unnecessary use of 'mock'....* tests/build-utils.scm ("wrap-script, simple case"): Use the real 'which' instead of mocking it. Ludovic Courtès
2019-11-26tests: Avoid (catch 'srfi-34 …) form....* tests/build-utils.scm ("wrap-script, raises condition"): Use 'guard' instead of "catch 'srfi-34". Ludovic Courtès
2019-06-17utils: Add 'invoke/quiet'....* gnu/build/bootloader.scm (G_): Remove. (open-pipe-with-stderr, invoke/quiet): Move to... * guix/build/utils.scm: ... here. Use 'let-values' instead of 'define-values' because Guile 2.0 (the bootstrap Guile) doesn't know about 'define-values'. * po/guix/POTFILES.in: Remove gnu/build/bootloader.scm, and add guix/build/utils.scm. * tests/build-utils.scm: Remove import of (gnu build bootloader). Ludovic Courtès
2019-03-23Merge branch 'staging' into core-updatesMarius Bakke
2019-03-16booloader: Add 'invoke/quiet'....* gnu/build/bootloader.scm (G_): New macro. (open-pipe-with-stderr, invoke/quiet): New procedures. * tests/build-utils.scm ("invoke/quiet, success") ("invoke/quiet, failure") ("invoke/quiet, failure, message on stderr"): New tests. * po/guix/POTFILES.in: Add bootloader.scm. Ludovic Courtès
2019-03-16tests: Add 'with-environment-variable'....* tests/scripts.scm (with-environment-variable): Move to... * guix/tests.scm (with-environment-variable): ... here. * tests/build-utils.scm ("wrap-program, one input, multiple calls"): Use it instead of 'setenv'. Ludovic Courtès
2019-02-08guix: Add wrap-script....* guix/build/utils.scm (wrap-script): New procedure. (&wrap-error): New condition. (wrap-error?, wrap-error-program, wrap-error-type): New procedures. * tests/build-utils.scm ("wrap-script, simple case", "wrap-script, with encoding declaration", "wrap-script, raises condition"): New tests. Ricardo Wurmus