paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-20 10:45:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

* switch IDE to external linker on win32/64 for now (mingw linking compat)

Browse Source 
git-svn-id: trunk@16614 -
This commit is contained in:
marco 2010-12-22 19:27:09 +00:00
parent eed9b88f20
commit 1b107bb4a5
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ide/Makefile
View File

@ -1,5 +1,5 @@
#
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29]
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/11/29]
#
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 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-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
@ -272,6 +272,15 @@ endif
override NOCPUDEF=1
override FPCOPT+= -d$(PPC_TARGET)
ifndef NOGDB
ifeq ($(FULL_TARGET),i386-win32)
needlinkparam=1
endif
ifeq ($(FULL_TARGET),x86_64-win64)
needlinkparam=1
endif
ifdef needlinkparam
override SPECIALLINK=-Xe -k--allow-multiple-definition
endif
ifdef GDBLIBDIR
override LIBGDBFILE:=$(firstword $(wildcard $(addsuffix /libgdb.a,$(GDBLIBDIR))))
endif
@ -1872,7 +1881,9 @@ REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_FV=1
REQUIRE_PACKAGES_GDBINT=1
REQUIRE_PACKAGES_REGEXPR=1
REQUIRE_PACKAGES_UNIVINT=1
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_ICONVENC=1
REQUIRE_PACKAGES_FCL-XML=1
REQUIRE_PACKAGES_CHM=1
endif
@ -3389,7 +3400,7 @@ compiler/$(FPCMADE):
compilerclean :
$(MAKE) -C compiler clean
fp$(EXEEXT): $(wildcard *.pas) $(wildcard *.inc)
$(COMPILER) $(GDBLIBINCCOND) fp.pas
$(COMPILER) $(GDBLIBINCCOND) $(SPECIALLINK) fp.pas
buildfp:
$(MAKE) compilerunits
$(MAKE) testgdb

14
ide/Makefile.fpc
View File

@ -45,6 +45,18 @@ override FPCOPT+= -d$(PPC_TARGET)
ifndef NOGDB
ifeq ($(FULL_TARGET),i386-win32)
needlinkparam=1
endif
ifeq ($(FULL_TARGET),x86_64-win64)
needlinkparam=1
endif
ifdef needlinkparam
override SPECIALLINK=-Xe -k--allow-multiple-definition
endif
# Try to find GDB library
# Look for a valid GDBLIBDIR environment variable
ifdef GDBLIBDIR
@ -166,7 +178,7 @@ compilerclean :
# to use.
#
fp$(EXEEXT): $(wildcard *.pas) $(wildcard *.inc)
$(COMPILER) $(GDBLIBINCCOND) fp.pas
$(COMPILER) $(GDBLIBINCCOND) $(SPECIALLINK) fp.pas
buildfp:
$(MAKE) compilerunits