Browse Source

Set CPU_SPECIFIC_COMMON_UNITS to empty for i8086-embedded

Pierre Muller 2 years ago
parent
commit
33ce4c5fce
2 changed files with 10 additions and 8 deletions
  1. 4 3
      rtl/embedded/Makefile
  2. 6 5
      rtl/embedded/Makefile.fpc

+ 4 - 3
rtl/embedded/Makefile

@@ -886,9 +886,6 @@ endif
 ifdef RELEASE
 ifdef RELEASE
 override FPCOPT+=-Ur
 override FPCOPT+=-Ur
 endif
 endif
-ifeq ($(ARCH),i8086)
-override [email protected]
-endif
 CPU_UNITS=
 CPU_UNITS=
 SYSINIT_UNITS=
 SYSINIT_UNITS=
 CPU_SPECIFIC_COMMON_UNITS=$(SYSUTILSUNIT) $(MATHUNIT) $(CLASSESUNIT) \
 CPU_SPECIFIC_COMMON_UNITS=$(SYSUTILSUNIT) $(MATHUNIT) $(CLASSESUNIT) \
@@ -1007,6 +1004,10 @@ ifeq ($(CPU_UNITS_DEFINED),)
 $(error No CPUs enabled for given SUBARCH, pass either a SUBARCH or set CPU_UNITS_DEFINED=1 if you know what you are doing)
 $(error No CPUs enabled for given SUBARCH, pass either a SUBARCH or set CPU_UNITS_DEFINED=1 if you know what you are doing)
 endif
 endif
 endif
 endif
+ifeq ($(ARCH),i8086)
+override [email protected]
+CPU_SPECIFIC_COMMON_UNITS=
+endif
 ifeq ($(ARCH),x86_64)
 ifeq ($(ARCH),x86_64)
 endif
 endif
 ifeq ($(ARCH),m68k)
 ifeq ($(ARCH),m68k)

+ 6 - 5
rtl/embedded/Makefile.fpc

@@ -60,11 +60,6 @@ ifdef RELEASE
 override FPCOPT+=-Ur
 override FPCOPT+=-Ur
 endif
 endif
 
 
-# Always include rtl.cfg config file for i8086
-ifeq ($(ARCH),i8086)
-override [email protected]
-endif
-
 CPU_UNITS=
 CPU_UNITS=
 SYSINIT_UNITS=
 SYSINIT_UNITS=
 CPU_SPECIFIC_COMMON_UNITS=$(SYSUTILSUNIT) $(MATHUNIT) $(CLASSESUNIT) \
 CPU_SPECIFIC_COMMON_UNITS=$(SYSUTILSUNIT) $(MATHUNIT) $(CLASSESUNIT) \
@@ -189,6 +184,12 @@ $(error No CPUs enabled for given SUBARCH, pass either a SUBARCH or set CPU_UNIT
 endif
 endif
 endif
 endif
 
 
+ifeq ($(ARCH),i8086)
+# Always include rtl.cfg config file for i8086
+override [email protected]
+CPU_SPECIFIC_COMMON_UNITS=
+endif
+
 ifeq ($(ARCH),x86_64)
 ifeq ($(ARCH),x86_64)
 # CPU_UNITS=$(MULTIBOOTUNIT)
 # CPU_UNITS=$(MULTIBOOTUNIT)
 endif
 endif