|
@@ -254,9 +254,9 @@ OS_TARGET:=$(word 5,$(FPC_COMPILERINFO))
|
|
endif
|
|
endif
|
|
|
|
|
|
CPU_OS_TARGET=$(CPU_TARGET)-$(OS_TARGET)
|
|
CPU_OS_TARGET=$(CPU_TARGET)-$(OS_TARGET)
|
|
-ifdef ARCH_TARGET
|
|
|
|
-L_ARCH_TARGET=$(call lc,$(ARCH_TARGET))
|
|
|
|
-FULL_TARGET:=$(CPU_TARGET)-$(OS_TARGET)-$(L_ARCH_TARGET)
|
|
|
|
|
|
+ifdef SUB_TARGET
|
|
|
|
+L_SUB_TARGET=$(call lc,$(SUB_TARGET))
|
|
|
|
+FULL_TARGET:=$(CPU_TARGET)-$(OS_TARGET)-$(L_SUB_TARGET)
|
|
else
|
|
else
|
|
FULL_TARGET:=$(CPU_TARGET)-$(OS_TARGET)
|
|
FULL_TARGET:=$(CPU_TARGET)-$(OS_TARGET)
|
|
endif
|
|
endif
|
|
@@ -266,9 +266,9 @@ endif
|
|
# Reason for defining it: this could redefine a "cross-compile".
|
|
# Reason for defining it: this could redefine a "cross-compile".
|
|
#
|
|
#
|
|
CPU_OS_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)
|
|
CPU_OS_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)
|
|
-ifdef ARCH_SOURCE
|
|
|
|
-L_ARCH_SOURCE=$(call lc,$(ARCH_SOURCE))
|
|
|
|
-FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)-$(L_ARCH_SOURCE)
|
|
|
|
|
|
+ifdef SUB_SOURCE
|
|
|
|
+L_SUB_SOURCE=$(call lc,$(SUB_SOURCE))
|
|
|
|
+FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)-$(L_SUB_SOURCE)
|
|
else
|
|
else
|
|
FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)
|
|
FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)
|
|
endif
|
|
endif
|
|
@@ -289,8 +289,8 @@ ifeq ($(FULL_TARGET),aarch64-embedded)
|
|
# override FPCOPT+=-Cp$(SUBARCH)
|
|
# override FPCOPT+=-Cp$(SUBARCH)
|
|
endif
|
|
endif
|
|
|
|
|
|
-ifdef ARCH_TARGET
|
|
|
|
-override FPCOPT+=-t$(ARCH_TARGET)
|
|
|
|
|
|
+ifdef SUB_TARGET
|
|
|
|
+override FPCOPT+=-t$(SUB_TARGET)
|
|
endif
|
|
endif
|
|
|
|
|
|
|
|
|
|
@@ -390,7 +390,7 @@ BUILDNATIVE=1
|
|
export BUILDNATIVE
|
|
export BUILDNATIVE
|
|
endif
|
|
endif
|
|
|
|
|
|
-export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE ARCH_TARGET ARCH_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE CPU_OS_TARGET CPU_OS_SOURCE
|
|
|
|
|
|
+export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE SUB_TARGET SUB_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE CPU_OS_TARGET CPU_OS_SOURCE
|
|
|
|
|
|
[fpmakefpcdetect]
|
|
[fpmakefpcdetect]
|
|
#####################################################################
|
|
#####################################################################
|