diff options
| author | marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2015-01-14 15:50:00 +0000 |
|---|---|---|
| committer | marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2015-01-14 15:50:00 +0000 |
| commit | a1609a5cd0eab7401a2dccf80094c1d347f7c07a (patch) | |
| tree | fafa4f5d168cc9a8aee95b9196b0c986882e5348 | |
| parent | 47d0338fa3a0c8d1e2410fb05a93e8c0d7b88cf4 (diff) | |
| download | fpc-a1609a5cd0eab7401a2dccf80094c1d347f7c07a.tar.gz | |
* fpmkunit makefile fix for dragonfly BSD, mantis #27309
git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@29473 3ad0048d-3df7-0310-abae-a5850022a9f2
| -rw-r--r-- | packages/fpmkunit/Makefile | 6 | ||||
| -rw-r--r-- | packages/fpmkunit/Makefile.fpc | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/packages/fpmkunit/Makefile b/packages/fpmkunit/Makefile index 166ed4b4e7..ddfe590e77 100644 --- a/packages/fpmkunit/Makefile +++ b/packages/fpmkunit/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2014-12-07 rev 29213] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015-01-04 rev 29399] # default: all MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim i386-android i386-aros 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 powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos @@ -348,7 +348,7 @@ UNIT_PROCESS= ifneq ($(findstring $(OS_SOURCE),win32 win64),) UNIT_PROCESS+=-Fi../fcl-process/src/win endif -ifneq ($(findstring $(OS_SOURCE),linux freebsd darwin iphonesim netbsd openbsd solaris haiku aix android),) +ifneq ($(findstring $(OS_SOURCE),linux freebsd darwin iphonesim netbsd openbsd solaris haiku aix android dragonfly),) UNIT_PROCESS+=-Fi../fcl-process/src/unix endif ifneq ($(findstring $(OS_SOURCE),os2 emx),) @@ -1864,7 +1864,7 @@ ifdef CREATESHARED override FPCOPT+=-Cg endif ifneq ($(findstring $(OS_TARGET),dragonfly freebsd openbsd netbsd linux solaris),) -ifeq ($(CPU_TARGET),x86_64) +ifneq ($(findstring $(CPU_TARGET),x86_64 mips mipsel),) override FPCOPT+=-Cg endif endif diff --git a/packages/fpmkunit/Makefile.fpc b/packages/fpmkunit/Makefile.fpc index 3ccd649f53..8976d05f0d 100644 --- a/packages/fpmkunit/Makefile.fpc +++ b/packages/fpmkunit/Makefile.fpc @@ -39,7 +39,7 @@ UNIT_PROCESS= ifneq ($(findstring $(OS_SOURCE),win32 win64),) UNIT_PROCESS+=-Fi../fcl-process/src/win endif -ifneq ($(findstring $(OS_SOURCE),linux freebsd darwin iphonesim netbsd openbsd solaris haiku aix android),) +ifneq ($(findstring $(OS_SOURCE),linux freebsd darwin iphonesim netbsd openbsd solaris haiku aix android dragonfly),) UNIT_PROCESS+=-Fi../fcl-process/src/unix endif ifneq ($(findstring $(OS_SOURCE),os2 emx),) |