Browse Source

* Enabled compilation of the cpu unit for arm-android and x86_64-android.

git-svn-id: trunk@39971 -
yury 6 years ago
parent
commit
9199d1935a
2 changed files with 8 additions and 2 deletions
  1. 4 1
      rtl/android/Makefile
  2. 4 1
      rtl/android/Makefile.fpc

+ 4 - 1
rtl/android/Makefile

@@ -343,8 +343,11 @@ UNITPREFIX=rtl
 CPU_UNITS=
 SYSINIT_UNITS=
 LOADERS=prt0 dllprt0
+ifeq ($(findstring $(ARCH),i386 x86_64 arm),$(ARCH))
+CPU_UNITS=cpu
+endif
 ifeq ($(ARCH),i386)
-CPU_UNITS=cpu mmx
+CPU_UNITS+=mmx
 endif
 SYSTEMUNIT=system
 ifdef RELEASE

+ 4 - 1
rtl/android/Makefile.fpc

@@ -65,8 +65,11 @@ SYSINIT_UNITS=
 
 LOADERS=prt0 dllprt0
 
+ifeq ($(findstring $(ARCH),i386 x86_64 arm),$(ARCH))
+CPU_UNITS=cpu
+endif
 ifeq ($(ARCH),i386)
-CPU_UNITS=cpu mmx
+CPU_UNITS+=mmx
 endif
 
 SYSTEMUNIT=system