diff options
| author | joost <joost@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2007-07-18 20:34:15 +0000 |
|---|---|---|
| committer | joost <joost@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2007-07-18 20:34:15 +0000 |
| commit | c3a7b8e61dffe6fae732b6e4638a8e9d70740bf9 (patch) | |
| tree | 17383d1a2aab8cf869b0e0690748244f73bb0591 | |
| parent | cd414029dba7eace6e3268fa50383b706e309669 (diff) | |
| download | fpc-c3a7b8e61dffe6fae732b6e4638a8e9d70740bf9.tar.gz | |
Merged revisions 7995-7996,8084 via svnmerge from
svn+ssh://joost@svn.freepascal.org/FPC/svn/fpc/trunk
........
r7995 | Almindor | 2007-07-09 23:09:26 +0200 (Mon, 09 Jul 2007) | 2 lines
* exchange "arch" with "uname -m" in samplecfg to work on non-linux
........
r7996 | Almindor | 2007-07-09 23:14:59 +0200 (Mon, 09 Jul 2007) | 2 lines
* adds amd64 to the list of uname -m possible results in samplecfg
........
r8084 | joost | 2007-07-17 19:39:35 +0200 (Tue, 17 Jul 2007) | 1 line
* Replaced "uname m" from which the output was not very consistent with "fpc -PP"
........
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_2_2@8095 3ad0048d-3df7-0310-abae-a5850022a9f2
| -rw-r--r-- | compiler/utils/samplecfg | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/utils/samplecfg b/compiler/utils/samplecfg index 57703a5447..a6ef113bfd 100644 --- a/compiler/utils/samplecfg +++ b/compiler/utils/samplecfg @@ -125,8 +125,8 @@ esac CPUCROSSIFDEF1="#DEFINE NEEDCROSSBINUTILS" CPUCROSSIFDEF2="" -case `arch` in - i?86|x86_64) +case `fpc -PP` in + i?86|x86_64|amd64) # Cross-binutils are not needed to compile for i386 on an x86_64 system CPUCROSSIFDEF1=" #IFNDEF CPUI386 |