From 731c33e26dd921d29c8f5ef9315d7331aa674fcd Mon Sep 17 00:00:00 2001
From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Thu, 13 Apr 2017 22:57:35 +0800
Subject: [PATCH] Skip mldr32 on Android

Android NDK with x86_64 doesn't support -m32 with -ldl
---
 src/startup/CMakeLists.txt | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/startup/CMakeLists.txt b/src/startup/CMakeLists.txt
index 5557730d9..e49bd52b2 100644
--- a/src/startup/CMakeLists.txt
+++ b/src/startup/CMakeLists.txt
@@ -38,15 +38,22 @@ set(mldr_sources
 add_executable(mldr ${mldr_sources})
 target_link_libraries(mldr Threads::Threads dl)
 
-add_executable(mldr32 ${mldr_sources})
-target_link_libraries(mldr32 Threads::Threads dl)
-set_target_properties(mldr32
-	PROPERTIES
-		COMPILE_FLAGS "-m32"
-		LINK_FLAGS "-m32"
-)
-
-install(TARGETS mldr mldr32 DESTINATION libexec/darling/bin)
+if(NOT BUILD_ANDROID)
+	# With Android NDK, -m32 does not work with -ldl as there's
+	# lib64/libdl.so but no lib/libdl.so
+	add_executable(mldr32 ${mldr_sources})
+	target_link_libraries(mldr32 Threads::Threads dl)
+	set_target_properties(mldr32
+		PROPERTIES
+			COMPILE_FLAGS "-m32"
+			LINK_FLAGS "-m32"
+	)
+endif(NOT BUILD_ANDROID)
+
+install(TARGETS mldr DESTINATION libexec/darling/bin)
+if(NOT BUILD_ANDROID)
+	install(TARGETS mldr32 DESTINATION libexec/darling/bin)
+endif(NOT BUILD_ANDROID)
 install(TARGETS darling DESTINATION bin
     PERMISSIONS
     OWNER_READ OWNER_WRITE OWNER_EXECUTE
-- 
2.51.2