diff options
| author |   Andrew Gaffney <agaffney@gentoo.org> | 2006-08-05 20:43:10 +0000 |
|---|---|---|
| committer | Andrew Gaffney <agaffney@gentoo.org> | 2006-08-05 20:43:10 +0000 |
| commit | ce184486641180aef0652c8c72daa523f21a122d (patch) | |
| tree | dd9600c3f4ac6a3ba1d1a8e8cb518a4bd714e6d7 /src/installer | |
| parent | disable MBR checkbox if selecting None for bootloader (diff) | |
| download | gentoo-ce184486641180aef0652c8c72daa523f21a122d.tar.gz gentoo-ce184486641180aef0652c8c72daa523f21a122d.tar.bz2 gentoo-ce184486641180aef0652c8c72daa523f21a122d.zip | |
separate amd64 CFLAGS from x86 CFLAGS
Diffstat (limited to 'src/installer')
| -rw-r--r-- | src/installer/src/fe/gtk/MakeDotConf.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/installer/src/fe/gtk/MakeDotConf.py b/src/installer/src/fe/gtk/MakeDotConf.py index 0a5fd1d725..f53426064c 100644 --- a/src/installer/src/fe/gtk/MakeDotConf.py +++ b/src/installer/src/fe/gtk/MakeDotConf.py @@ -16,7 +16,9 @@ class Panel(GLIScreen.GLIScreen): use_flags = [] use_desc = {} columns = [] - arch_procs = { 'x86': ("i386", "i486", "i586", "pentium", "pentium-mmx", "i686", "pentiumpro", "pentium2", "pentium3", "pentium3m", "pentium-m", "pentium4", "pentium4m", "prescott", "nocona", "k6", "k6-2", "k6-3", "athlon", "athlon-tbird", "athlon-4", "athlon-xp", "athlon-mp", "k8", "opteron", "athlon64", "athlon-fx", "winchip-c6", "winchip2", "c3", "c3-2") } + arch_procs = { 'x86': ("i386", "i486", "i586", "pentium", "pentium-mmx", "i686", "pentiumpro", "pentium2", "pentium3", "pentium3m", "pentium-m", "pentium4", "pentium4m", "prescott", "k6", "k6-2", "k6-3", "athlon", "athlon-tbird", "athlon-4", "athlon-xp", "athlon-mp", "winchip-c6", "winchip2", "c3", "c3-2"), + 'amd64': ("k8", "opteron", "athlon64", "athlon-fx", "nocona") + } optimizations = ["-O0", "-O1", "-O2", "-Os", "-O3"] _helptext = """ <b><u>Make.conf</u></b> @@ -164,7 +166,7 @@ but this guideline isn't always perfect. The syntax for the MAKEOPTS varaible is hbox = gtk.HBox(False, 0) hbox.pack_start(gtk.Label("Proc:"), expand=False, fill=False, padding=0) self.proc_combo = gtk.combo_box_new_text() - for proc in self.arch_procs['x86']: + for proc in self.arch_procs[self.controller.client_profile.get_architecture_template()]: self.proc_combo.append_text(proc) self.proc_combo.set_active(0) hbox.pack_start(self.proc_combo, expand=False, fill=False, padding=10) |