瀏覽代碼

* Rename ARCH to more neutral SUB

Michael VAN CANNEYT 2 年之前
父節點
當前提交
a87804008d
共有 4 個文件被更改,包括 167 次插入166 次删除
  1. 157 155
      utils/fpcm/fpcmake.inc
  2. 9 9
      utils/fpcm/fpcmake.ini
  3. 0 1
      utils/fpcm/fpcmake.lpi
  4. 1 1
      utils/fpcm/revision.inc

文件差異過大導致無法顯示
+ 157 - 155
utils/fpcm/fpcmake.inc


+ 9 - 9
utils/fpcm/fpcmake.ini

@@ -254,9 +254,9 @@ OS_TARGET:=$(word 5,$(FPC_COMPILERINFO))
 endif
 
 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
 FULL_TARGET:=$(CPU_TARGET)-$(OS_TARGET)
 endif
@@ -266,9 +266,9 @@ endif
 # Reason for defining it: this could redefine a "cross-compile".
 #
 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
 FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)
 endif
@@ -289,8 +289,8 @@ ifeq ($(FULL_TARGET),aarch64-embedded)
 # override FPCOPT+=-Cp$(SUBARCH)
 endif
 
-ifdef ARCH_TARGET 
-override FPCOPT+=-t$(ARCH_TARGET)
+ifdef SUB_TARGET 
+override FPCOPT+=-t$(SUB_TARGET)
 endif
 
 
@@ -390,7 +390,7 @@ BUILDNATIVE=1
 export BUILDNATIVE
 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]
 #####################################################################

+ 0 - 1
utils/fpcm/fpcmake.lpi

@@ -7,7 +7,6 @@
         <MainUnitHasCreateFormStatements Value="False"/>
         <MainUnitHasTitleStatement Value="False"/>
         <MainUnitHasScaledStatement Value="False"/>
-        <UseDefaultCompilerOptions Value="True"/>
       </Flags>
       <SessionStorage Value="InProjectDir"/>
       <Title Value="fpcmake"/>

+ 1 - 1
utils/fpcm/revision.inc

@@ -1 +1 @@
-'2022-04-24 hash fc6d558727'
+'2022-12-15 hash f57fc07d1d'

部分文件因文件數量過多而無法顯示