diff options
| author | peter <peter@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2007-10-29 16:34:18 +0000 |
|---|---|---|
| committer | peter <peter@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2007-10-29 16:34:18 +0000 |
| commit | 8ffbd4fd337514fedf1ea3e37dffb2478a40afdd (patch) | |
| tree | a7f89f496039b2a642a82a83bb0b82eefc5a2503 /packages/fcl-net | |
| parent | 38afff7c2706862d971b0af3e0e8f51fa9eb8111 (diff) | |
| download | fpc-8ffbd4fd337514fedf1ea3e37dffb2478a40afdd.tar.gz | |
* regenerated to fix fpc detection on non-i386
git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@8991 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'packages/fcl-net')
| -rw-r--r-- | packages/fcl-net/Makefile | 6 | ||||
| -rw-r--r-- | packages/fcl-net/tests/Makefile | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/packages/fcl-net/Makefile b/packages/fcl-net/Makefile index a9c558516a..28f5a6482d 100644 --- a/packages/fcl-net/Makefile +++ b/packages/fcl-net/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/10/25] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/10/29] # default: all MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded @@ -108,7 +108,11 @@ ifndef FPC FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) +ifneq ($(CPU_TARGET),) FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) +else +FPC:=$(shell $(FPCPROG) -PB) +endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif diff --git a/packages/fcl-net/tests/Makefile b/packages/fcl-net/tests/Makefile index 188c793459..5a2744fe5d 100644 --- a/packages/fcl-net/tests/Makefile +++ b/packages/fcl-net/tests/Makefile @@ -108,7 +108,11 @@ ifndef FPC FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) +ifneq ($(CPU_TARGET),) FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) +else +FPC:=$(shell $(FPCPROG) -PB) +endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) endif |