From: Chris Gianelloni Date: Fri, 3 Nov 2006 21:18:45 +0000 (+0000) Subject: Added a warning about changing the CHOST setting for bug #142034. X-Git-Tag: CATALYST_2_0_6_916~313 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ebf57426e48108e01602e3332b95e00c11045ee5;p=catalyst.git Added a warning about changing the CHOST setting for bug #142034. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1181 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index efb30091..7e007f4f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.664 2006/10/02 20:41:53 wolf31o2 Exp $ + 03 Nov 2006; Chris Gianelloni + modules/generic_stage_target.py: + Added a warning about changing the CHOST setting for bug #142034. + 11 Oct 2006; Chris Gianelloni AUTHORS, modules/generic_stage_target.py, targets/stage1/stage1-controller.sh, targets/support/chroot-functions.sh: diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index b5b2e7ec..a52ff19e 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -876,8 +876,6 @@ class generic_stage_target(generic_target): myf.write("# These settings were set by the catalyst build script that automatically\n# built this stage.\n") myf.write("# Please consult /etc/make.conf.example for a more detailed example.\n") myf.write('CFLAGS="'+self.settings["CFLAGS"]+'"\n') - myf.write('CHOST="'+self.settings["CHOST"]+'"\n') - if self.settings.has_key("CXXFLAGS"): myf.write('CXXFLAGS="'+self.settings["CXXFLAGS"]+'"\n') else: @@ -885,7 +883,9 @@ class generic_stage_target(generic_target): if self.settings.has_key("LDFLAGS"): myf.write('LDFLAGS="'+self.settings["LDFLAGS"]+'"\n') - + myf.write("# This should not be changed unless you know exactly what you are doing. You\n# should probably be using a different stage, instead.\m") + myf.write('CHOST="'+self.settings["CHOST"]+'"\n') + # Figure out what our USE vars are for building myusevars=[] if self.settings.has_key("HOSTUSE"):