diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2017-03-13 23:08:49 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2017-03-13 23:08:49 +0200 |
| commit | 3f9543aee1e49001d0f80542dd71ba73c44787c7 (patch) | |
| tree | 50ee1bdd53b1e5ec69cb8655f23da79c332dde1e /gnu/packages/regex.scm | |
| parent | 864a9590ad948df09f2ad6e9e929608a7587a5f7 (diff) | |
| parent | a71c863834448e2645518b31b60a96ef488dd761 (diff) | |
| download | guix-3f9543aee1e49001d0f80542dd71ba73c44787c7.tar.gz | |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/packages/regex.scm')
| -rw-r--r-- | gnu/packages/regex.scm | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/gnu/packages/regex.scm b/gnu/packages/regex.scm index 11f4716033..f55faaf042 100644 --- a/gnu/packages/regex.scm +++ b/gnu/packages/regex.scm @@ -22,7 +22,8 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) - #:use-module (guix build-system gnu)) + #:use-module (guix build-system gnu) + #:use-module (guix utils)) (define-public re2 (package @@ -42,7 +43,16 @@ (arguments `(#:test-target "test" ;; There is no configure step, but the Makefile respects a prefix. - #:make-flags (list (string-append "prefix=" %output)) + ;; As ./configure does not know anything about the target CXX + ;; we need to specify TARGET-g++ explicitly. + #:make-flags (list (string-append "prefix=" %output) + (string-append + "CXX=" ,(string-append + (if (%current-target-system) + (string-append + (%current-target-system) "-") + "") + "g++"))) #:phases (modify-phases %standard-phases (delete 'configure) |