paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-12 13:06:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update Makefile's using latest fixes fpcmake utility

Browse Source
This commit is contained in:
Pierre Muller 2023-10-04 03:55:05 -05:00
parent 25acaac104
commit 82c57e2deb
4 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -1516,6 +1516,19 @@ override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)
override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX) override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)
endif endif
endif endif
ifdef SYSROOTPATH
override FPCOPT+=-XR$(SYSROOTPATH)
else
ifeq ($(OS_TARGET),$(OS_SOURCE))
ifneq ($(findstring $(OS_TARGET),darwin),)
ifneq ($(findstring $(CPU_TARGET),aarch64),)
ifneq ($(wildcard /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk),)
override FPCOPT+=-XR/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
endif
endif
endif
endif
endif
ifdef CREATESHARED ifdef CREATESHARED
override FPCOPT+=-Cg override FPCOPT+=-Cg
endif endif

13
installer/Makefile
View File

@ -3329,6 +3329,19 @@ override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)
override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX) override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)
endif endif
endif endif
ifdef SYSROOTPATH
override FPCOPT+=-XR$(SYSROOTPATH)
else
ifeq ($(OS_TARGET),$(OS_SOURCE))
ifneq ($(findstring $(OS_TARGET),darwin),)
ifneq ($(findstring $(CPU_TARGET),aarch64),)
ifneq ($(wildcard /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk),)
override FPCOPT+=-XR/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
endif
endif
endif
endif
endif
ifdef CREATESHARED ifdef CREATESHARED
override FPCOPT+=-Cg override FPCOPT+=-Cg
endif endif

13
packages/Makefile
View File

@ -1438,6 +1438,19 @@ override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)
override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX) override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)
endif endif
endif endif
ifdef SYSROOTPATH
override FPCOPT+=-XR$(SYSROOTPATH)
else
ifeq ($(OS_TARGET),$(OS_SOURCE))
ifneq ($(findstring $(OS_TARGET),darwin),)
ifneq ($(findstring $(CPU_TARGET),aarch64),)
ifneq ($(wildcard /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk),)
override FPCOPT+=-XR/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
endif
endif
endif
endif
endif
ifdef CREATESHARED ifdef CREATESHARED
override FPCOPT+=-Cg override FPCOPT+=-Cg
endif endif

13
utils/Makefile
View File

@ -2185,6 +2185,19 @@ override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)
override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX) override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)
endif endif
endif endif
ifdef SYSROOTPATH
override FPCOPT+=-XR$(SYSROOTPATH)
else
ifeq ($(OS_TARGET),$(OS_SOURCE))
ifneq ($(findstring $(OS_TARGET),darwin),)
ifneq ($(findstring $(CPU_TARGET),aarch64),)
ifneq ($(wildcard /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk),)
override FPCOPT+=-XR/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
endif
endif
endif
endif
endif
ifdef CREATESHARED ifdef CREATESHARED
override FPCOPT+=-Cg override FPCOPT+=-Cg
endif endif