01/01: gnu: cross-base: Turn '%xgcc' into a macro.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit be99170ddbb3c7bc46b8e3cc5184e2e51bdb3785
Author: Ludovic Courtès <address@hidden>
Date:   Mon May 29 13:23:36 2017 +0200

    gnu: cross-base: Turn '%xgcc' into a macro.
    
    Previously:
    
      ./pre-inst-env guile -c '(use-modules (gnu packages gcc))'
    
    would fail due to circular dependencies.
    
    * gnu/packages/cross-base.scm (%xgcc): Turn into a macro.
---
 gnu/packages/cross-base.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index d5ca9b8..abc3a28 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <address@hidden>
+;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <address@hidden>
 ;;; Copyright © 2014, 2015 Mark H Weaver <address@hidden>
 ;;; Copyright © 2016 Jan Nieuwenhuizen <address@hidden>
 ;;; Copyright © 2016 Manolis Fragkiskos Ragkousis <address@hidden>
@@ -40,10 +40,13 @@
             cross-gcc
             cross-newlib?))
 
-(define %xgcc
+(define-syntax %xgcc
   ;; GCC package used as the basis for cross-compilation.  It doesn't have to
   ;; be 'gcc' and can be a specific variant such as 'gcc-4.8'.
-  gcc)
+  ;;
+  ;; Note: This is a macro so that we do not refer to 'gcc' from the top
+  ;; level, which would lead to circular-dependency issues.
+  (identifier-syntax gcc))
 
 (define %gcc-include-paths
   ;; Environment variables for header search paths.