diff options
| author | florian <florian@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2021-04-05 15:39:07 +0000 |
|---|---|---|
| committer | florian <florian@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2021-04-05 15:39:07 +0000 |
| commit | e3f2bd1ac7270a5ffdea008743eba282151b232a (patch) | |
| tree | 0a965e552ed9a088c8626a36cb47b0307a1721f2 /packages/fcl-fpcunit | |
| parent | 7a95cb4f41ec51b4eda59f5f4b96c1d4713dfa24 (diff) | |
| download | fpc-e3f2bd1ac7270a5ffdea008743eba282151b232a.tar.gz | |
* Makefiles regenerated
git-svn-id: https://svn.freepascal.org/svn/fpc/trunk@49124 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'packages/fcl-fpcunit')
| -rw-r--r-- | packages/fcl-fpcunit/Makefile | 13 | ||||
| -rw-r--r-- | packages/fcl-fpcunit/src/exampletests/Makefile | 13 | ||||
| -rw-r--r-- | packages/fcl-fpcunit/src/tests/Makefile | 13 |
3 files changed, 39 insertions, 0 deletions
diff --git a/packages/fcl-fpcunit/Makefile b/packages/fcl-fpcunit/Makefile index cc88aaf315..a6d8bd6865 100644 --- a/packages/fcl-fpcunit/Makefile +++ b/packages/fcl-fpcunit/Makefile @@ -2291,6 +2291,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 diff --git a/packages/fcl-fpcunit/src/exampletests/Makefile b/packages/fcl-fpcunit/src/exampletests/Makefile index 3c226f87a1..6f11fae56f 100644 --- a/packages/fcl-fpcunit/src/exampletests/Makefile +++ b/packages/fcl-fpcunit/src/exampletests/Makefile @@ -3342,6 +3342,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 diff --git a/packages/fcl-fpcunit/src/tests/Makefile b/packages/fcl-fpcunit/src/tests/Makefile index 46f7d9fec9..7274cfc555 100644 --- a/packages/fcl-fpcunit/src/tests/Makefile +++ b/packages/fcl-fpcunit/src/tests/Makefile @@ -3342,6 +3342,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 |