diff options
| author | marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2016-11-25 10:54:00 +0000 |
|---|---|---|
| committer | marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2016-11-25 10:54:00 +0000 |
| commit | 01e59938f34ebdbba329a354a230bd392768a2a9 (patch) | |
| tree | 223516440502fa812d3c5155c917651552ed91a8 | |
| parent | 5216dbe9a2e035c43ebfc9bd36ac4104fcd8f178 (diff) | |
| download | fpc-01e59938f34ebdbba329a354a230bd392768a2a9.tar.gz | |
--- Merging r34876 into '.':
C rtl/freebsd/Makefile
U rtl/freebsd/Makefile.fpc
--- Recording mergeinfo for merge of r34876 into '.':
U .
Summary of conflicts:
Text conflicts: 1
# revisions: 34876,34877
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@34960 3ad0048d-3df7-0310-abae-a5850022a9f2
| -rw-r--r-- | rtl/freebsd/Makefile | 5 | ||||
| -rw-r--r-- | rtl/freebsd/Makefile.fpc | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/rtl/freebsd/Makefile b/rtl/freebsd/Makefile index c88569e83a..073b347dc2 100644 --- a/rtl/freebsd/Makefile +++ b/rtl/freebsd/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015-10-06 rev 31969] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015/03/26] # 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 @@ -2957,7 +2957,8 @@ dllprt0$(OEXT) : $(CPU_TARGET)/dllprt0.as $(AS) -o $(UNITTARGETDIRPREFIX)dllprt0$(OEXT) $(CPU_TARGET)/dllprt0.as $(SYSTEMUNIT)$(PPUEXT) : $(BSDINC)/$(SYSTEMUNIT).pp unxconst.inc $(SYSDEPS) $(COMPILER) -Us -Sg $(BSDINC)/$(SYSTEMUNIT).pp -uuchar$(PPUEXT): $(SYSTEMUNIT)$(PPUEXT) $(INC)/uuchar.pp +uuchar$(PPUEXT): $(INC)/uuchar.pp $(SYSTEMUNIT)$(PPUEXT) + $(COMPILER) $< objpas$(PPUEXT): $(OBJPASDIR)/objpas.pp $(INC)/except.inc $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) -I$(OBJPASDIR) $(OBJPASDIR)/objpas.pp strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc\ diff --git a/rtl/freebsd/Makefile.fpc b/rtl/freebsd/Makefile.fpc index 5c61a5a1f5..e7df44f8c1 100644 --- a/rtl/freebsd/Makefile.fpc +++ b/rtl/freebsd/Makefile.fpc @@ -133,7 +133,8 @@ dllprt0$(OEXT) : $(CPU_TARGET)/dllprt0.as $(SYSTEMUNIT)$(PPUEXT) : $(BSDINC)/$(SYSTEMUNIT).pp unxconst.inc $(SYSDEPS) $(COMPILER) -Us -Sg $(BSDINC)/$(SYSTEMUNIT).pp -uuchar$(PPUEXT): $(SYSTEMUNIT)$(PPUEXT) $(INC)/uuchar.pp +uuchar$(PPUEXT): $(INC)/uuchar.pp $(SYSTEMUNIT)$(PPUEXT) + $(COMPILER) $< objpas$(PPUEXT): $(OBJPASDIR)/objpas.pp $(INC)/except.inc $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) -I$(OBJPASDIR) $(OBJPASDIR)/objpas.pp |