mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-04-06 09:07:59 +02:00
Update Makefile's using latest fixes fpcmake utility
This commit is contained in:
parent
25acaac104
commit
82c57e2deb
13
Makefile
13
Makefile
@ -1516,6 +1516,19 @@ override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)
|
||||
override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)
|
||||
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
|
||||
override FPCOPT+=-Cg
|
||||
endif
|
||||
|
@ -3329,6 +3329,19 @@ override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)
|
||||
override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)
|
||||
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
|
||||
override FPCOPT+=-Cg
|
||||
endif
|
||||
|
@ -1438,6 +1438,19 @@ override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)
|
||||
override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)
|
||||
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
|
||||
override FPCOPT+=-Cg
|
||||
endif
|
||||
|
@ -2185,6 +2185,19 @@ override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)
|
||||
override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)
|
||||
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
|
||||
override FPCOPT+=-Cg
|
||||
endif
|
||||
|
Loading…
Reference in New Issue
Block a user