summaryrefslogtreecommitdiff
path: root/Master/install-tl
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2009-09-18 00:02:03 +0000
committerNorbert Preining <preining@logic.at>2009-09-18 00:02:03 +0000
commit565ba2d2efdefec90a5dcaa2a5f0a52de08410cb (patch)
tree5ae207fbe495b04504c5a0b60a4ed78ca9fea940 /Master/install-tl
parent8508e50c1ba6aedbcc89f9146c9d563478dcd193 (diff)
move the --force-arch check *before* any TLUtils::platform() call
(and thus also before the setup_programs call) to make it actually work if config.guess breaks git-svn-id: svn://tug.org/texlive/trunk@15353 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/install-tl')
-rwxr-xr-xMaster/install-tl13
1 files changed, 7 insertions, 6 deletions
diff --git a/Master/install-tl b/Master/install-tl
index 4c6fa01cbd9..ccca573033b 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -341,6 +341,13 @@ if (($opt_gui ne "text") && !$opt_no_gui && ($opt_profile eq "")) {
}
}
+#
+if (defined($opt_force_arch)) {
+ tlwarn("Overriding platform to $opt_force_arch\n");
+ $::_platform_ = $opt_force_arch;
+}
+$vars{'this_platform'} = $::_platform_;
+
# initialize the correct platform
platform();
@@ -394,12 +401,6 @@ if ($location =~ m!^(ctan$|(http|ftp)://)!i) {
}
info("Installing TeX Live $TeXLive::TLConfig::ReleaseYear from: $location\n");
-if (defined($opt_force_arch)) {
- tlwarn("Overriding platform to $opt_force_arch\n");
- $::_platform_ = $opt_force_arch;
-}
-$vars{'this_platform'} = $::_platform_;
-
info("Platform: ", platform, " => \'", platform_desc(platform), "\'\n");
if ($opt_custom_bin) {
if (-d $opt_custom_bin) {