Add CMAKE_EXECUTABLE_SUFFIX to build with Android toolchain on Windows.

[chaoren]

For some reason CMAKE_EXECUTABLE_SUFFIX is not actually set by cmake at this point, requiring a -DCMAKE_EXECUTABLE_SUFFIX=.exe flag. Perhaps we need to manually detect if the platform is Windows and set it?

[flackr]

I think we need to do the same in test/make/Makefile.rules for AR and OBJCOPY.

I'm curious why it's not getting set automatically, as far as I can tell it should be. It seems to be defined in the cmake source at Modules/Platform/Windows.cmake

[zturner]

Can we look into why it's not set automatically? If you litter some
messages around the cmake code that sets it, you should be able to figure
it out

[chaoren]

This is probably why:

http://www.cmake.org/cmake/help/v3.0/variable/CMAKE_TOOLCHAIN_FILE.html

a file which is read early in the CMake run

I guess we could just use the same fix as this: rL126219

[chaoren]

AR and OBJCOPY and workaround for CMAKE_EXECUTABLE_SUFFIX being undefined

[flackr]

I'm a little confused about why you're setting EXECUTABLE_SUFFIX in Android.cmake but checking CMAKE_EXECUTABLE_SUFFIX in Makefile.rules, shouldn't those both be CMAKE_EXECUTABLE_SUFFIX?

test/make/Makefile.rules

88 ↗

(On Diff #24321)

Add $(CMAKE_EXECUTABLE_SUFFIX) here too. I believe libtool would need to be used if running the test suite from Windows against a remote mac target, just as we need to use ar for linking when targetting linux from mac.

[flackr]

In D9177#161956, @flackr wrote:

I'm a little confused about why you're setting EXECUTABLE_SUFFIX in Android.cmake but checking CMAKE_EXECUTABLE_SUFFIX in Makefile.rules, shouldn't those both be CMAKE_EXECUTABLE_SUFFIX?

Nevermind, I've looked up many examples to the contrary. I'm still not sure though if CMAKE_EXECUTABLE_SUFFIX will pick up the EXECUTABLE_SUFFIX or if the examples are just using a separate variable because CMAKE_EXECUTABLE_SUFFIX is not supposed to be settable. Maybe we need to set EXECUTABLE_SUFFIX in Makefile.rules and use that, i.e. in Makefile.rules:
EXECUTABLE_SUFFIX ?= $(CMAKE_EXECUTABLE_SUFFIX)

then use $(EXECUTABLE_SUFFIX)

[chaoren]

I think the reason CMAKE_EXECUTABLE_SUFFIX isn't being set is because Android.cmake is being run as a CMAKE_TOOLCHAIN_FILE.

Ugh, Makefile.rules is for Makefile rules not CMake rules so CMAKE_EXECUTABLE_SUFFIX makes no sense at all. Do you have Windows -> {Linux, OS X} tests running yet?

test/make/Makefile.rules

88 ↗

(On Diff #24321)

These look like rules for a mac host instead of a mac target, since xcrun looks like an XCode command.

[chaoren]

I think we need to do the same in test/make/Makefile.rules for AR and OBJCOPY.

Actually, I don't that'd be necessary. You can invoke executables on Windows without the extension, it's just that CMake actually checks if the executable exists. I originally made this CL because I wanted to cross compile the Android lldb-server on Windows (not terribly important, but sort of annoying if you have to switch to Linux while working on Windows -> Android). But there are other problems after this one, (e.g., Ninja generates response files with backslashes, but the ld.exe in the Android toolchain wants forward slashes). It's starting to look like more effort than it's worth.

[chaoren]

CMake variable shouldn't appear in Makefile rules.

lldb/trunk/cmake/platforms/Android.cmake

  set( ANDROID_TOOLCHAIN_NAME "mips64el-linux-android" )
 else()
  message( SEND_ERROR "Unknown ANDROID_ABI = \"${ANDROID_ABI}\"." )
 endif()
 
 set( ANDROID_TOOLCHAIN_DIR "${ANDROID_TOOLCHAIN_DIR}" CACHE INTERNAL "Android standalone toolchain directory" FORCE )
 set( ANDROID_SYSROOT "${ANDROID_TOOLCHAIN_DIR}/sysroot" CACHE INTERNAL "Android Sysroot" FORCE )
 
+# CMAKE_EXECUTABLE_SUFFIX is undefined in CMAKE_TOOLCHAIN_FILE
+if( WIN32 )
+ set( EXECUTABLE_SUFFIX ".exe" )
+endif()
+
 # force python exe to be the one in Android toolchian
-set( PYTHON_EXECUTABLE "${ANDROID_TOOLCHAIN_DIR}/bin/python" CACHE INTERNAL "Python exec path" FORCE )
+set( PYTHON_EXECUTABLE "${ANDROID_TOOLCHAIN_DIR}/bin/python${EXECUTABLE_SUFFIX}" CACHE INTERNAL "Python exec path" FORCE )
 
 if( NOT CMAKE_C_COMPILER )
- set( CMAKE_C_COMPILER   "${ANDROID_TOOLCHAIN_DIR}/bin/${ANDROID_TOOLCHAIN_NAME}-gcc"     CACHE PATH "C compiler" )
- set( CMAKE_CXX_COMPILER "${ANDROID_TOOLCHAIN_DIR}/bin/${ANDROID_TOOLCHAIN_NAME}-g++"     CACHE PATH "C++ compiler" )
- set( CMAKE_ASM_COMPILER "${ANDROID_TOOLCHAIN_DIR}/bin/${ANDROID_TOOLCHAIN_NAME}-gcc"     CACHE PATH "assembler" )
- set( CMAKE_STRIP        "${ANDROID_TOOLCHAIN_DIR}/bin/${ANDROID_TOOLCHAIN_NAME}-strip"   CACHE PATH "strip" )
- set( CMAKE_AR           "${ANDROID_TOOLCHAIN_DIR}/bin/${ANDROID_TOOLCHAIN_NAME}-ar"      CACHE PATH "archive" )
- set( CMAKE_LINKER       "${ANDROID_TOOLCHAIN_DIR}/bin/${ANDROID_TOOLCHAIN_NAME}-ld"      CACHE PATH "linker" )
- set( CMAKE_NM           "${ANDROID_TOOLCHAIN_DIR}/bin/${ANDROID_TOOLCHAIN_NAME}-nm"      CACHE PATH "nm" )
- set( CMAKE_OBJCOPY      "${ANDROID_TOOLCHAIN_DIR}/bin/${ANDROID_TOOLCHAIN_NAME}-objcopy" CACHE PATH "objcopy" )
- set( CMAKE_OBJDUMP      "${ANDROID_TOOLCHAIN_DIR}/bin/${ANDROID_TOOLCHAIN_NAME}-objdump" CACHE PATH "objdump" )
- set( CMAKE_RANLIB       "${ANDROID_TOOLCHAIN_DIR}/bin/${ANDROID_TOOLCHAIN_NAME}-ranlib"  CACHE PATH "ranlib" )
+ set( CMAKE_C_COMPILER   "${ANDROID_TOOLCHAIN_DIR}/bin/${ANDROID_TOOLCHAIN_NAME}-gcc${EXECUTABLE_SUFFIX}"     CACHE PATH "C compiler" )
+ set( CMAKE_CXX_COMPILER "${ANDROID_TOOLCHAIN_DIR}/bin/${ANDROID_TOOLCHAIN_NAME}-g++${EXECUTABLE_SUFFIX}"     CACHE PATH "C++ compiler" )
+ set( CMAKE_ASM_COMPILER "${ANDROID_TOOLCHAIN_DIR}/bin/${ANDROID_TOOLCHAIN_NAME}-gcc${EXECUTABLE_SUFFIX}"     CACHE PATH "assembler" )
+ set( CMAKE_STRIP        "${ANDROID_TOOLCHAIN_DIR}/bin/${ANDROID_TOOLCHAIN_NAME}-strip${EXECUTABLE_SUFFIX}"   CACHE PATH "strip" )
+ set( CMAKE_AR           "${ANDROID_TOOLCHAIN_DIR}/bin/${ANDROID_TOOLCHAIN_NAME}-ar${EXECUTABLE_SUFFIX}"      CACHE PATH "archive" )
+ set( CMAKE_LINKER       "${ANDROID_TOOLCHAIN_DIR}/bin/${ANDROID_TOOLCHAIN_NAME}-ld${EXECUTABLE_SUFFIX}"      CACHE PATH "linker" )
+ set( CMAKE_NM           "${ANDROID_TOOLCHAIN_DIR}/bin/${ANDROID_TOOLCHAIN_NAME}-nm${EXECUTABLE_SUFFIX}"      CACHE PATH "nm" )
+ set( CMAKE_OBJCOPY      "${ANDROID_TOOLCHAIN_DIR}/bin/${ANDROID_TOOLCHAIN_NAME}-objcopy${EXECUTABLE_SUFFIX}" CACHE PATH "objcopy" )
+ set( CMAKE_OBJDUMP      "${ANDROID_TOOLCHAIN_DIR}/bin/${ANDROID_TOOLCHAIN_NAME}-objdump${EXECUTABLE_SUFFIX}" CACHE PATH "objdump" )
+ set( CMAKE_RANLIB       "${ANDROID_TOOLCHAIN_DIR}/bin/${ANDROID_TOOLCHAIN_NAME}-ranlib${EXECUTABLE_SUFFIX}"  CACHE PATH "ranlib" )
 endif()
 
 set( ANDROID_CXX_FLAGS "--sysroot=${ANDROID_SYSROOT} -pie -fPIE -funwind-tables -fsigned-char -no-canonical-prefixes" )
 # TODO: different ARM abi have different flags such as neon, vfpv etc
 if( X86 )
  set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -funswitch-loops -finline-limit=300" )
 endif()