[sdks] Add cross-{arm,arm64,x86,x86_64}{,-win} runtimes for XA + Unify provisioning of LLVM for both Android and iOS. (#10445)

* [sdks] Add CrossRuntimeTemplate

* [sdks] Add cross-{arm,arm64,x86,x86_64}{,-win} runtimes for XA

* [sdks] Use CrossRuntimeTemplate for iOS

* [sdks] Factor various variables for RuntimeTemplate

* [sdks] Use MonoRuntime template for desktop-x86_64

* [sdks] Unify provisioning of LLVM for both Android and iOS.

A global CFLAGS would be set in `run-jenkins.sh`, and that would screw up with LLVM. The global CFLAGS makes sense as long as we are only building Mono, but that's not the case with LLVM anymore.

* [sdks] Remove android-armeabi, it's been removed from XA already and the target has been deprecated in the NDK
This commit is contained in:
Ludovic Henry authored and GitHub committed 2018-09-03 17:30:31 -04:00
1 parent f25f9e5f2b
commit 0dbcdd5c28
15 files changed
+448 -256

No files matched your search

-8
View File
@@ -6,13 +6,5 @@
"remote-branch": "origin/release_60",
"branch": "release_60",
"directory": "llvm"
},
{
"name": "llvm36",
"url": "git://github.com/mono/llvm.git",
"rev": "0b3cb8ac12cd839f8110775d4085e822e8af4d7b",
"remote-branch": "origin/master",
"branch": "master",
"directory": "llvm36"
}
]
+5 -9
View File
@@ -13,11 +13,9 @@ top_srcdir ?= $(abspath $(CURDIR)/..)
LLVM_PATH ?= $(abspath $(top_srcdir)/external/llvm)
LLVM_BUILD ?= $(abspath $(top_srcdir)/llvm/build)
LLVM_PREFIX ?= $(abspath $(top_srcdir)/llvm/usr)
LLVM_RELEASE ?= llvm
# FIXME: URL should be http://xamjenkinsartifact.blob.core.windows.net/build-package-osx-llvm-$(NEEDED_LLVM_BRANCH)/llvm-osx64-$(NEEDED_LLVM_VERSION).tar.gz
LLVM_DOWNLOAD_LOCATION = "http://xamjenkinsartifact.blob.core.windows.net/build-package-osx-llvm-release60/llvm-osx64-$(NEEDED_LLVM_VERSION).tar.gz"
LLVM36_DOWNLOAD_LOCATION = "http://xamjenkinsartifact.blob.core.windows.net/build-package-osx-llvm/llvm-osx64-$(NEEDED_LLVM36_VERSION).tar.gz"
CMAKE := $(or $(CMAKE),$(shell which cmake))
NINJA := $(shell which ninja)
@@ -26,7 +24,6 @@ SUBMODULES_CONFIG_FILE = $(top_srcdir)/llvm/SUBMODULES.json
include $(top_srcdir)/scripts/submodules/versions.mk
$(eval $(call ValidateVersionTemplate,llvm,LLVM))
$(eval $(call ValidateVersionTemplate,llvm36,LLVM36))
# Bump the given submodule to the revision given by the REV make variable
# If COMMIT is 1, commit the change
@@ -43,7 +40,10 @@ bump-current-llvm: __bump-current-version-llvm
$(LLVM_BUILD) $(LLVM_PREFIX):
mkdir -p $@
$(LLVM_PATH)/CMakeLists.txt: | reset-$(LLVM_RELEASE)
$(LLVM_PATH):
$(MAKE) -f build.mk reset-llvm
$(LLVM_PATH)/CMakeLists.txt: | $(LLVM_PATH)
EXTRA_LLVM_ARGS = $(if $(filter $(LLVM_TARGET),wasm32), -DLLVM_BUILD_32_BITS=On -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="WebAssembly",)
@@ -79,11 +79,7 @@ install-llvm: build-llvm | $(LLVM_PREFIX)
.PHONY: download-llvm
download-llvm:
mkdir -p llvm-tmp && cd llvm-tmp && (wget --no-verbose -O - $(LLVM_DOWNLOAD_LOCATION) || curl -L $(LLVM_DOWNLOAD_LOCATION)) | tar xzf -
.PHONY: download-llvm36
download-llvm36:
mkdir -p llvm36-tmp && cd llvm36-tmp && (wget --no-verbose -O - $(LLVM36_DOWNLOAD_LOCATION) || curl -L $(LLVM36_DOWNLOAD_LOCATION)) | tar xzf -
(wget --no-verbose -O - $(LLVM_DOWNLOAD_LOCATION) || curl -L $(LLVM_DOWNLOAD_LOCATION)) | tar -xzf - -C $(dir $(LLVM_PREFIX))
.PHONY: clean-llvm
clean-llvm:
+12 -7
View File
@@ -22,7 +22,7 @@ if [[ ${CI_TAGS} == *'win-'* ]]; then
# Passing -ggdb3 on Cygwin breaks linking against libmonosgen-x.y.dll
export CFLAGS="$CFLAGS -g -O2"
else
export CFLAGS="$CFLAGS -ggdb3 -O2"
export EXTRA_CFLAGS="$EXTRA_CFLAGS -ggdb3 -O2"
fi
if [[ $CI_TAGS == *'collect-coverage'* ]]; then
@@ -38,8 +38,8 @@ fi
# We don't want to have to maintain symbolification blobs for CI
export EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --with-crash-privacy=no "
if [[ ${CI_TAGS} == *'osx-i386'* ]]; then CFLAGS="$CFLAGS -m32 -arch i386 -mmacosx-version-min=10.9"; LDFLAGS="$LDFLAGS -m32 -arch i386"; EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --with-libgdiplus=/Library/Frameworks/Mono.framework/Versions/Current/lib/libgdiplus.dylib --host=i386-apple-darwin13.0.0 --build=i386-apple-darwin13.0.0"; fi
if [[ ${CI_TAGS} == *'osx-amd64'* ]]; then CFLAGS="$CFLAGS -m64 -arch x86_64 -mmacosx-version-min=10.9"; LDFLAGS="$LDFLAGS -m64 -arch x86_64" EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --with-libgdiplus=/Library/Frameworks/Mono.framework/Versions/Current/lib/libgdiplus.dylib"; fi
if [[ ${CI_TAGS} == *'osx-i386'* ]]; then EXTRA_CFLAGS="$EXTRA_CFLAGS -m32 -arch i386 -mmacosx-version-min=10.9"; EXTRA_LDFLAGS="$EXTRA_LDFLAGS -m32 -arch i386"; EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --with-libgdiplus=/Library/Frameworks/Mono.framework/Versions/Current/lib/libgdiplus.dylib --host=i386-apple-darwin13.0.0 --build=i386-apple-darwin13.0.0"; fi
if [[ ${CI_TAGS} == *'osx-amd64'* ]]; then EXTRA_CFLAGS="$EXTRA_CFLAGS -m64 -arch x86_64 -mmacosx-version-min=10.9"; EXTRA_LDFLAGS="$EXTRA_LDFLAGS -m64 -arch x86_64" EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --with-libgdiplus=/Library/Frameworks/Mono.framework/Versions/Current/lib/libgdiplus.dylib"; fi
if [[ ${CI_TAGS} == *'win-i386'* ]]; then PLATFORM=Win32; EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --host=i686-w64-mingw32"; export MONO_EXECUTABLE="${MONO_REPO_ROOT}/msvc/build/sgen/Win32/bin/Release/mono-sgen.exe"; fi
if [[ ${CI_TAGS} == *'win-amd64'* ]]; then PLATFORM=x64; EXTRA_CONF_FLAGS="${EXTRA_CONF_FLAGS} --host=x86_64-w64-mingw32 --disable-boehm"; export MONO_EXECUTABLE="${MONO_REPO_ROOT}/msvc/build/sgen/x64/bin/Release/mono-sgen.exe"; fi
@@ -101,6 +101,8 @@ if [[ ${CI_TAGS} == *'product-sdks-ios'* ]];
echo "DISABLE_WASM=1" >> sdks/Make.config
export device_test_suites="Mono.Runtime.Tests System.Core"
${TESTCMD} --label=provision-llvm --timeout=60m --fatal make -j4 -C sdks/builds provision-llvm36-llvm32 provision-llvm-llvm64
${TESTCMD} --label=build-sim-runtimes --timeout=60m --fatal make -j4 -C sdks/builds package-ios-{sim64,sim32,simtv,simwatch}
${TESTCMD} --label=build-dev-runtimes --timeout=60m --fatal make -j4 -C sdks/builds package-ios-{target64,target32,targettv,targetwatch}
${TESTCMD} --label=build-cross-compilers --timeout=60m --fatal make -j4 -C sdks/builds package-ios-{cross64,cross32,crosswatch}
@@ -124,7 +126,7 @@ if [[ ${CI_TAGS} == *'product-sdks-ios'* ]];
if [[ ${CI_TAGS} == *'run-device-tests'* ]]; then
for suite in ${device_test_suites}; do ${TESTCMD} --label=run-ios-dev-interp-mixed-${suite} --timeout=10m make -C sdks/ios run-ios-dev-${suite}; done
fi
${TESTCMD} --label=package --timeout=60m tar cvzf mono-product-sdk-$GIT_COMMIT.tar.gz -C sdks/out/ bcl ios-llvm64 ios-llvm32 ios-cross32-release ios-cross64-release
${TESTCMD} --label=package --timeout=60m tar cvzf mono-product-sdk-$GIT_COMMIT.tar.gz -C sdks/out/ bcl llvm-llvm64 llvm36-llvm32 ios-cross32-release ios-cross64-release
exit 0
fi
@@ -132,12 +134,15 @@ if [[ ${CI_TAGS} == *'product-sdks-android'* ]];
then
echo "IGNORE_PROVISION_ANDROID=1" > sdks/Make.config
echo "IGNORE_PROVISION_MXE=1" >> sdks/Make.config
echo "IGNORE_PROVISION_LLVM=1" >> sdks/Make.config
echo "DISABLE_CCACHE=1" >> sdks/Make.config
${TESTCMD} --label=provision-android --timeout=120m --fatal make -j4 -C sdks/builds provision-android
if [[ ${CI_TAGS} == *'provision-mxe'* ]]; then
${TESTCMD} --label=provision-mxe --timeout=240m --fatal make -j4 -C sdks/builds provision-mxe
fi
${TESTCMD} --label=runtimes --timeout=120m --fatal make -j4 -C sdks/builds package-android-{armeabi,armeabi-v7a,arm64-v8a,x86,x86_64} package-android-host-{Darwin,mxe-Win64}
${TESTCMD} --label=llvm --timeout=240m --fatal make -j4 -C sdks/builds provision-llvm-llvm{,win}{32,64}
# FIXME: ${TESTCMD} --label=runtimes --timeout=120m --fatal make -j4 -C sdks/builds package-android-{armeabi-v7a,arm64-v8a,x86,x86_64} package-android-host-{Darwin,mxe-Win64} package-android-cross-{arm,arm64,x86,x86_64}{,-win}
${TESTCMD} --label=runtimes --timeout=120m --fatal make -j4 -C sdks/builds package-android-{armeabi-v7a,arm64-v8a,x86,x86_64} package-android-host-{Darwin,mxe-Win64} package-android-cross-{arm,arm64,x86,x86_64}
exit 0
fi
@@ -168,8 +173,8 @@ fi
if [[ ${CI_TAGS} != *'mac-sdk'* ]]; # Mac SDK builds Mono itself
then
echo ./autogen.sh $EXTRA_CONF_FLAGS
${TESTCMD} --label=configure --timeout=60m --fatal ./autogen.sh $EXTRA_CONF_FLAGS
echo ./autogen.sh CFLAGS="$CFLAGS $EXTRA_CFLAGS" CXXFLAGS="$CXXFLAGS $EXTRA_CXXFLAGS" LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS" $EXTRA_CONF_FLAGS
${TESTCMD} --label=configure --timeout=60m --fatal ./autogen.sh CFLAGS="$CFLAGS $EXTRA_CFLAGS" CXXFLAGS="$CXXFLAGS $EXTRA_CXXFLAGS" LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS" $EXTRA_CONF_FLAGS
fi
if [[ ${CI_TAGS} == *'win-i386'* ]];
then
+1 -1
View File
@@ -1,6 +1,6 @@
#!/bin/bash -e
${TESTCMD} --label=bockbuild --timeout=300m --fatal ${MONO_REPO_ROOT}/scripts/mac-sdk-package.sh
${TESTCMD} --label=bockbuild --timeout=300m --fatal CFLAGS="$CFLAGS $EXTRA_CFLAGS" CXXFLAGS="$CXXFLAGS $EXTRA_CXXFLAGS" LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS" ${MONO_REPO_ROOT}/scripts/mac-sdk-package.sh
# switch to using package Mono instead of system
export PATH=${MONO_REPO_ROOT}/external/bockbuild/stage/bin:$PATH
+9 -3
View File
@@ -1,4 +1,3 @@
# build artifacts
.stamp-*
*.mk.generated
*.config.cache
@@ -7,6 +6,7 @@ llvm-llvm32/
llvm-llvm64/
llvm-llvmwin32/
llvm-llvmwin64/
llvm36-llvm32/
android-armeabi-*/
android-armeabi-v7a-*/
android-arm64-v8a-*/
@@ -16,6 +16,14 @@ android-host-Darwin-*/
android-host-Linux-*/
android-host-mxe-Win32-*/
android-host-mxe-Win64-*/
android-cross-arm-*/
android-cross-arm64-*/
android-cross-x86-*/
android-cross-x86_64-*/
android-cross-arm-win-*/
android-cross-arm64-win-*/
android-cross-x86-win-*/
android-cross-x86_64-win-*/
ios-target32-*/
ios-target32s-*/
ios-target64-*/
@@ -32,6 +40,4 @@ wasm-interp/
bcl/
desktop-x86/
desktop-x86_64/
# android toolchain
toolchains/
+2 -3
View File
@@ -35,11 +35,10 @@ configure-mono: $(TOP)/configure
$(TOP)/configure: $(TOP)/configure.ac $(TOP)/autogen.sh
cd $(TOP) && PATH=$(EXTRA_PATH):$$PATH NOCONFIGURE=1 ./autogen.sh
$(TOP)/tools/offsets-tool/MonoAotOffsetsDumper.exe: $(wildcard $(TOP)/tools/offsets-tool/*.cs)
$(MAKE) -C $(dir $@) MonoAotOffsetsDumper.exe
TARGETS=
include runtime.mk
## MXE targets
ifndef DISABLE_ANDROID
# FIXME add iOS support(?)
+122 -31
View File
@@ -1,6 +1,4 @@
include runtime.mk
ANDROID_URI?=https://dl.google.com/android/repository/
ANT_URI?=https://archive.apache.org/dist/ant/binaries/
@@ -31,6 +29,9 @@ provision-android-$(3)-$(1): $$(ANDROID_TOOLCHAIN_DIR)/$(3)$$(if $(2),/$(2))/.st
.PHONY: provision-android
provision-android: provision-android-$(3)-$(1)
.PHONY: provision
provision: provision-android-$(3)-$(1)
endef
AndroidNDKProvisioningTemplate=$(call AndroidProvisioningTemplate,$(1),,ndk,$(ANDROID_URI))
@@ -121,13 +122,11 @@ _android-$(1)_AC_VARS= \
_android-$(1)_CFLAGS= \
-fstack-protector \
-DMONODROID=1 \
$$(android-$(1)_CFLAGS)
-DMONODROID=1
_android-$(1)_CXXFLAGS= \
-fstack-protector \
-DMONODROID=1 \
$$(android-$(1)_CXXFLAGS)
-DMONODROID=1
_android-$(1)_CPPFLAGS= \
-I$$(ANDROID_TOOLCHAIN_PREFIX)/$(1)-clang/usr/include
@@ -139,13 +138,9 @@ _android-$(1)_LDFLAGS= \
-z now -z relro -z noexecstack \
-ldl -lm -llog -lc -lgcc \
-Wl,-rpath-link=$$(ANDROID_TOOLCHAIN_DIR)/ndk/platforms/android-$$(ANDROID_SDK_VERSION_$(1))/arch-$(2)/usr/lib,-dynamic-linker=/system/bin/linker \
-L$$(ANDROID_TOOLCHAIN_DIR)/ndk/platforms/android-$$(ANDROID_SDK_VERSION_$(1))/arch-$(2)/usr/lib \
$$(android-$(1)_LDFLAGS)
-L$$(ANDROID_TOOLCHAIN_DIR)/ndk/platforms/android-$$(ANDROID_SDK_VERSION_$(1))/arch-$(2)/usr/lib
_android-$(1)_CONFIGURE_FLAGS= \
--host=$(4) \
--cache-file=$$(TOP)/sdks/builds/android-$(1)-$$(CONFIGURATION).config.cache \
--prefix=$$(TOP)/sdks/out/android-$(1)-$$(CONFIGURATION) \
--disable-boehm \
--disable-executables \
--disable-iconv \
@@ -160,22 +155,17 @@ _android-$(1)_CONFIGURE_FLAGS= \
--with-tls=pthread \
--without-ikvm-native \
--disable-cooperative-suspend \
--disable-hybrid-suspend
--disable-hybrid-suspend \
--disable-crash-reporting
.stamp-android-$(1)-toolchain: | $$(if $$(IGNORE_PROVISION_ANDROID),,provision-android)
python "$$(ANDROID_TOOLCHAIN_DIR)/ndk/build/tools/make_standalone_toolchain.py" --verbose --force --api=$$(ANDROID_SDK_VERSION_$(1)) --arch=$(2) --install-dir=$$(ANDROID_TOOLCHAIN_PREFIX)/$(1)-clang
touch $$@
$$(eval $$(call RuntimeTemplate,android-$(1)))
$$(eval $$(call RuntimeTemplate,android-$(1),$(4)))
endef
## android-armeabi
android-armeabi_CFLAGS=-D__POSIX_VISIBLE=201002 -DSK_RELEASE -DNDEBUG -UDEBUG -fpic -march=armv5te
android-armeabi_CXXFLAGS=-D__POSIX_VISIBLE=201002 -DSK_RELEASE -DNDEBUG -UDEBUG -fpic -march=armv5te
android-armeabi_LDFLAGS=-Wl,--fix-cortex-a8
$(eval $(call AndroidTargetTemplate,armeabi,arm,arm-linux-androideabi,armv5-linux-androideabi))
## android-armeabi-v7a
android-armeabi-v7a_CFLAGS=-D__POSIX_VISIBLE=201002 -DSK_RELEASE -DNDEBUG -UDEBUG -fpic -march=armv7-a -mtune=cortex-a8 -mfpu=vfp -mfloat-abi=softfp
android-armeabi-v7a_CXXFLAGS=-D__POSIX_VISIBLE=201002 -DSK_RELEASE -DNDEBUG -UDEBUG -fpic -march=armv7-a -mtune=cortex-a8 -mfpu=vfp -mfloat-abi=softfp
@@ -213,12 +203,7 @@ _android-$(1)_LD=ld
_android-$(1)_RANLIB=ranlib
_android-$(1)_STRIP=strip
_android-$(1)_CFLAGS=$$(android-$(1)_CFLAGS)
_android-$(1)_CXXFLAGS=$$(android-$(1)_CXXFLAGS)
_android-$(1)_CONFIGURE_FLAGS= \
--cache-file=$$(TOP)/sdks/builds/android-$(1)-$$(CONFIGURATION).config.cache \
--prefix=$$(TOP)/sdks/out/android-$(1)-$$(CONFIGURATION) \
--disable-boehm \
--disable-iconv \
--disable-mono-debugger \
@@ -229,7 +214,8 @@ _android-$(1)_CONFIGURE_FLAGS= \
--with-mcs-docs=no \
--with-monodroid \
--with-profile4_x=no \
--without-ikvm-native
--without-ikvm-native \
--disable-crash-reporting
.stamp-android-$(1)-toolchain:
touch $$@
@@ -271,24 +257,21 @@ _android-$(1)_CXXFLAGS= \
-DXAMARIN_PRODUCT_VERSION=0
_android-$(1)_CONFIGURE_FLAGS= \
--host=$(2)-w64-mingw32$$(if $$(filter $(UNAME),Darwin),.static) \
--target=$(2)-w64-mingw32$$(if $$(filter $(UNAME),Darwin),.static) \
--cache-file=$$(TOP)/sdks/builds/android-$(1)-$$(CONFIGURATION).config.cache \
--prefix=$$(TOP)/sdks/out/android-$(1)-$$(CONFIGURATION) \
--disable-boehm \
--disable-llvm \
--disable-mcs-build \
--disable-nls \
--enable-maintainer-mode \
--enable-monodroid \
--with-monodroid
--with-monodroid \
--disable-crash-reporting
.stamp-android-$(1)-toolchain:
touch $$@
.stamp-android-$(1)-$$(CONFIGURATION)-configure: | $(if $(IGNORE_PROVISION_MXE),,provision-mxe)
$$(eval $$(call RuntimeTemplate,android-$(1)))
$$(eval $$(call RuntimeTemplate,android-$(1),$(2)-w64-mingw32$$(if $$(filter $(UNAME),Darwin),.static)))
endef
@@ -296,3 +279,111 @@ ifneq ($(MXE_PREFIX),)
$(eval $(call AndroidHostMxeTemplate,host-mxe-Win32,i686))
$(eval $(call AndroidHostMxeTemplate,host-mxe-Win64,x86_64))
endif
##
# Parameters
# $(1): target
# $(2): host arch
# $(3): target arch
# $(4): device target (armeabi-v7a, arm64-v8a, x86 or x86_64)
# $(5): llvm (llvm32, llvm64, llvmwin32 or llvmwin64)
# $(6): offsets dumper abi
define AndroidCrossTemplate
_android-$(1)_OFFSETS_DUMPER_ARGS=--gen-android --android-ndk="$$(ANDROID_TOOLCHAIN_DIR)/ndk"
_android-$(1)_AR=ar
_android-$(1)_AS=as
_android-$(1)_CC=$$(or $$(android-$(1)_CC),cc)
_android-$(1)_CXX=$$(or $$(android-$(1)_CXX),c++)
_android-$(1)_CXXCPP=cpp
_android-$(1)_LD=ld
_android-$(1)_RANLIB=ranlib
_android-$(1)_STRIP=strip
_android-$(1)_CFLAGS= \
$$(if $$(RELEASE),,-DDEBUG_CROSS) \
$$(if $$(filter $$(UNAME),Darwin),-mmacosx-version-min=10.9) \
-DXAMARIN_PRODUCT_VERSION=0
_android-$(1)_CXXFLAGS= \
$$(if $$(RELEASE),,-DDEBUG_CROSS) \
$$(if $$(filter $$(UNAME),Darwin),-mmacosx-version-min=10.9 -stdlib=libc++) \
-DXAMARIN_PRODUCT_VERSION=0
_android-$(1)_CONFIGURE_FLAGS= \
--disable-boehm \
--disable-mcs-build \
--disable-nls \
--enable-extension-module \
--enable-maintainer-mode \
--with-tls=pthread
$$(eval $$(call CrossRuntimeTemplate,android-$(1),$$(if $$(filter $$(UNAME),Darwin),$(2)-apple-darwin10,$$(if $$(filter $$(UNAME),Linux),$(2)-linux-gnu,$$(error "Unknown UNAME='$$(UNAME)'"))),$(3)-linux-android,$(4),$(5),$(6)))
endef
$(eval $(call AndroidCrossTemplate,cross-arm,i686,armv7,android-armeabi-v7a,llvm-llvm32,armv7-none-linux-androideabi))
$(eval $(call AndroidCrossTemplate,cross-arm64,x86_64,aarch64-v8a,android-arm64-v8a,llvm-llvm64,aarch64-v8a-linux-android))
$(eval $(call AndroidCrossTemplate,cross-x86,i686,i686,android-x86,llvm-llvm32,i686-none-linux-android))
$(eval $(call AndroidCrossTemplate,cross-x86_64,x86_64,x86_64,android-x86_64,llvm-llvm64,x86_64-none-linux-android))
##
# Parameters
# $(1): target
# $(2): host arch
# $(3): target arch
# $(4): device target
# $(5): llvm
# $(6): offsets dumper abi
define AndroidCrossMXETemplate
_android-$(1)_OFFSETS_DUMPER_ARGS=--gen-android --android-ndk="$$(ANDROID_TOOLCHAIN_DIR)/ndk"
_android-$(1)_PATH=$$(MXE_PREFIX)/bin
_android-$(1)_AR=$$(MXE_PREFIX)/bin/$(2)-w64-mingw32$$(if $$(filter $(UNAME),Darwin),.static)-ar
_android-$(1)_AS=$$(MXE_PREFIX)/bin/$(2)-w64-mingw32$$(if $$(filter $(UNAME),Darwin),.static)-as
_android-$(1)_CC=$$(MXE_PREFIX)/bin/$(2)-w64-mingw32$$(if $$(filter $(UNAME),Darwin),.static)-gcc
_android-$(1)_CXX=$$(MXE_PREFIX)/bin/$(2)-w64-mingw32$$(if $$(filter $(UNAME),Darwin),.static)-g++
_android-$(1)_DLLTOOL=$$(MXE_PREFIX)/bin/$(2)-w64-mingw32$$(if $$(filter $(UNAME),Darwin),.static)-dlltool
_android-$(1)_LD=$$(MXE_PREFIX)/bin/$(2)-w64-mingw32$$(if $$(filter $(UNAME),Darwin),.static)-ld
_android-$(1)_OBJDUMP=$$(MXE_PREFIX)/bin/$(2)-w64-mingw32$$(if $$(filter $(UNAME),Darwin),.static)-objdump
_android-$(1)_RANLIB=$$(MXE_PREFIX)/bin/$(2)-w64-mingw32$$(if $$(filter $(UNAME),Darwin),.static)-ranlib
_android-$(1)_STRIP=$$(MXE_PREFIX)/bin/$(2)-w64-mingw32$$(if $$(filter $(UNAME),Darwin),.static)-strip
_android-$(1)_CFLAGS= \
$$(if $$(RELEASE),,-DDEBUG_CROSS) \
-static \
-static-libgcc \
-DXAMARIN_PRODUCT_VERSION=0
_android-$(1)_CXXFLAGS= \
$$(if $$(RELEASE),,-DDEBUG_CROSS) \
-static \
-static-libgcc \
-DXAMARIN_PRODUCT_VERSION=0
_android-$(1)_LDFLAGS= \
-static \
-static-libgcc \
-static-libstdc++
_android-$(1)_CONFIGURE_FLAGS= \
--disable-boehm \
--disable-mcs-build \
--disable-nls \
--enable-extension-module \
--enable-maintainer-mode \
--with-tls=pthread
.stamp-android-$(1)-$$(CONFIGURATION)-configure: | $(if $(IGNORE_PROVISION_MXE),,provision-mxe)
$$(eval $$(call CrossRuntimeTemplate,android-$(1),$(2)-w64-mingw32$$(if $$(filter $(UNAME),Darwin),.static),$(3)-linux-android,$(4),$(5),$(6)))
endef
$(eval $(call AndroidCrossMXETemplate,cross-arm-win,i686,armv7,android-armeabi-v7a,llvm-llvmwin32,armv7-none-linux-androideabi))
$(eval $(call AndroidCrossMXETemplate,cross-arm64-win,x86_64,aarch64-v8a,android-arm64-v8a,llvm-llvmwin64,aarch64-v8a-linux-android))
$(eval $(call AndroidCrossMXETemplate,cross-x86-win,i686,i686,android-x86,llvm-llvmwin32,i686-none-linux-android))
$(eval $(call AndroidCrossMXETemplate,cross-x86_64-win,x86_64,x86_64,android-x86_64,llvm-llvmwin64,x86_64-none-linux-android))
+6 -27
View File
@@ -5,21 +5,14 @@
# $(2): host_triple
#
# Flags:
# desktop_$(1)_CFLAGS
# desktop_$(1)_CXXFLAGS
# desktop_$(1)_LDFLAGS
# desktop-$(1)_CFLAGS
# desktop-$(1)_CXXFLAGS
# desktop-$(1)_LDFLAGS
define DesktopTemplate
_desktop_$(1)_CONFIGURE_ENVIRONMENT = \
CFLAGS="$$(_desktop_$(1)_CFLAGS)" \
CXXFLAGS="$$(_desktop_$(1)_CXXFLAGS) " \
LDFLAGS="$$(_desktop_$(1)_LDFLAGS)" \
CC="cc"
_desktop-$(1)_CC=cc
_desktop_$(1)_CONFIGURE_FLAGS= \
--host=$(2) \
--cache-file=$$(TOP)/sdks/builds/desktop-$(1).config.cache \
--prefix=$$(TOP)/sdks/out/desktop-$(1) \
_desktop-$(1)_CONFIGURE_FLAGS= \
--disable-boehm \
--disable-iconv \
--disable-mcs-build \
@@ -30,21 +23,7 @@ _desktop_$(1)_CONFIGURE_FLAGS= \
--with-tls=pthread \
--without-ikvm-native
.PHONY: package-desktop-$(1)
package-desktop-$(1):
$$(MAKE) -C $$(TOP)/sdks/builds/desktop-$(1)/mono install
$$(MAKE) -C $$(TOP)/sdks/builds/desktop-$(1)/support install
.stamp-desktop-$(1)-configure: $$(TOP)/configure
mkdir -p $$(TOP)/sdks/builds/desktop-$(1)
cd $$(TOP)/sdks/builds/desktop-$(1) && $$(TOP)/configure $$(_desktop_$(1)_AC_VARS) $$(_desktop_$(1)_CONFIGURE_ENVIRONMENT) $$(_desktop_$(1)_CONFIGURE_FLAGS)
touch $$@
.PHONY: clean-desktop-$(1)
clean-desktop-$(1):
rm -rf $$(TOP)/sdks/builds/toolchains/desktop-$(1) $$(TOP)/sdks/builds/desktop-$(1) $$(TOP)/sdks/builds/desktop-$(1).config.cache
TARGETS += desktop-$(1)
$$(eval $$(call RuntimeTemplate,desktop-$(1),$(2)))
endef
+40 -83
View File
@@ -1,6 +1,4 @@
include runtime.mk
#
# Targets:
# - build-ios-<target>
@@ -29,8 +27,8 @@ BITCODE_CONFIGURE_FLAGS=--enable-llvm-runtime --with-bitcode=yes
#
# Parameters
# $(1): target (target32/target32s/target64)
# $(2): arch (armv7 or arm64)
# $(3): arch (arm or aarch64)
# $(2): host arch (arm or aarch64)
# $(3): host arch for compiler (armv7 or arm64)
#
# Flags:
# ios-$(1)_AC_VARS
@@ -62,44 +60,34 @@ _ios-$(1)_AC_VARS= \
ac_cv_func_utimensat=no \
ac_cv_func_shm_open_working_with_mmap=no \
mono_cv_sizeof_sunpath=104 \
mono_cv_uscore=yes \
$$(ios-$(1)_AC_VARS)
mono_cv_uscore=yes
_ios-$(1)_CFLAGS= \
$$(ios-$(1)_SYSROOT) \
-arch $(2) \
-arch $(3) \
-Wl,-application_extension \
-fexceptions \
$$(ios-$(1)_BITCODE_MARKER) \
$$(ios-$(1)_CFLAGS)
$$(ios-$(1)_BITCODE_MARKER)
_ios-$(1)_CXXFLAGS= \
$$(ios-$(1)_SYSROOT) \
-arch $(2) \
-arch $(3) \
-Wl,-application_extension \
$$(ios-$(1)_CXXFLAGS) \
$$(ios-$(1)_BITCODE_MARKER)
_ios-$(1)_CPPFLAGS= \
$$(ios_CPPFLAGS) \
$$(ios-$(1)_SYSROOT) \
-arch $(2) \
-arch $(3) \
-DSMALL_CONFIG -DDISABLE_POLICY_EVIDENCE=1 -D_XOPEN_SOURCE -DHOST_IOS -DHAVE_LARGE_FILE_SUPPORT=1 \
$$(ios-$(1)_CPPFLAGS)
_ios-$(1)_LDFLAGS= \
$$(ios_LDFLAGS) \
-Wl,-no_weak_imports \
-arch $(2) \
-arch $(3) \
-framework CoreFoundation \
-lobjc -lc++ \
$$(ios-$(1)_LDFLAGS)
-lobjc -lc++
_ios-$(1)_CONFIGURE_FLAGS = \
--build=i386-apple-darwin10 \
--host=$(3)-apple-darwin10 \
--cache-file=$(TOP)/sdks/builds/ios-$(1)-$$(CONFIGURATION).config.cache \
--prefix=$(TOP)/sdks/out/ios-$(1)-$$(CONFIGURATION) \
--disable-boehm \
--disable-btls \
--disable-executables \
@@ -121,12 +109,12 @@ _ios-$(1)_CONFIGURE_FLAGS = \
--without-sigaltstack \
--disable-cooperative-suspend \
--disable-hybrid-suspend \
$$(ios-$(1)_CONFIGURE_FLAGS)
--disable-crash-reporting
.stamp-ios-$(1)-toolchain:
touch $$@
$$(eval $$(call RuntimeTemplate,ios-$(1)))
$$(eval $$(call RuntimeTemplate,ios-$(1),$(2)-apple-darwin10))
endef
@@ -171,11 +159,11 @@ ios-targettv_AC_VARS = \
ios-targetwatch_AC_VARS = $(ios-targettv_AC_VARS)
# ios-target32_BITCODE_MARKER=-fembed-bitcode-marker
$(eval $(call iOSDeviceTemplate,target32,armv7,arm))
$(eval $(call iOSDeviceTemplate,target32s,armv7s,arm))
$(eval $(call iOSDeviceTemplate,target32,arm,armv7))
$(eval $(call iOSDeviceTemplate,target32s,arm,armv7s))
# ios-target64_BITCODE_MARKER=-fembed-bitcode-marker
$(eval $(call iOSDeviceTemplate,target64,arm64,aarch64))
$(eval $(call iOSDeviceTemplate,targettv,arm64,aarch64))
$(eval $(call iOSDeviceTemplate,target64,aarch64,arm64))
$(eval $(call iOSDeviceTemplate,targettv,aarch64,arm64))
$(eval $(call iOSDeviceTemplate,targetwatch,armv7k,armv7k))
##
@@ -183,7 +171,7 @@ $(eval $(call iOSDeviceTemplate,targetwatch,armv7k,armv7k))
#
# Parameters
# $(1): target (sim32 or sim64)
# $(2): arch (i386 or x86_64)
# $(2): host arch (i386 or x86_64)
#
# Flags:
# ios-$(1)_SYSROOT
@@ -209,36 +197,28 @@ _ios-$(1)_AC_VARS= \
ac_cv_func_futimens=no \
ac_cv_func_utimensat=no \
ac_cv_func_shm_open_working_with_mmap=no \
mono_cv_uscore=yes \
$(ios-$(1)_AC_VARS)
mono_cv_uscore=yes
_ios-$(1)_CFLAGS= \
$$(ios-$(1)_SYSROOT) \
-arch $(2) \
-Wl,-application_extension \
$$(ios-$(1)_CFLAGS)
-Wl,-application_extension
_ios-$(1)_CPPFLAGS= \
$$(ios_CPPFLAGS) \
$$(ios-$(1)_SYSROOT) \
-arch $(2) \
-Wl,-application_extension \
$$(ios-$(1)_CPPFLAGS)
-Wl,-application_extension
_ios-$(1)_CXXFLAGS= \
$$(ios-$(1)_SYSROOT) \
-arch $(2) \
-Wl,-application_extension\
$$(ios-$(1)_CXXFLAGS)
-Wl,-application_extension
_ios-$(1)_LDFLAGS= \
$$(ios_LDFLAGS) \
$$(ios-$(1)_LDFLAGS)
$$(ios_LDFLAGS)
_ios-$(1)_CONFIGURE_FLAGS= \
--host=$(2)-apple-darwin10 \
--cache-file=$$(TOP)/sdks/builds/ios-$(1)-$$(CONFIGURATION).config.cache \
--prefix=$$(TOP)/sdks/out/ios-$(1)-$$(CONFIGURATION) \
--disable-boehm \
--disable-btls \
--disable-executables \
@@ -253,14 +233,14 @@ _ios-$(1)_CONFIGURE_FLAGS= \
--without-ikvm-native \
--disable-cooperative-suspend \
--disable-hybrid-suspend \
$$(ios-$(1)_CONFIGURE_FLAGS)
--disable-crash-reporting
# _ios-$(1)_CONFIGURE_FLAGS += --enable-extension-module=xamarin
.stamp-ios-$(1)-toolchain:
touch $$@
$$(eval $$(call RuntimeTemplate,ios-$(1)))
$$(eval $$(call RuntimeTemplate,ios-$(1),$(2)-apple-darwin10))
endef
@@ -308,10 +288,11 @@ $(eval $(call iOSSimulatorTemplate,simwatch,i386))
##
# Parameters:
# $(1): target (cross32 or cross64)
# $(2): arch (arm or aarch64)
# $(3): llvm (llvm32 or llvm64)
# $(4): configure target arch
# $(5): offsets tool --abi argument
# $(2): host arch (i386 or x86_64)
# $(3): target arch (arm or aarch64)
# $(4): device target (target32, target64, ...)
# $(5): llvm (llvm32 or llvm64)
# $(6): offsets dumper abi
#
# Flags:
# ios-$(1)_AC_VARS
@@ -321,40 +302,31 @@ $(eval $(call iOSSimulatorTemplate,simwatch,i386))
# ios-$(1)_CONFIGURE_FLAGS
define iOSCrossTemplate
_ios-$(1)_OFFSET_TOOL_ABI=$(5)
_ios-$(1)_OFFSETS_DUMPER_ARGS=--gen-ios
_ios-$(1)_CC=$$(CCACHE) $$(PLATFORM_BIN)/clang
_ios-$(1)_CXX=$$(CCACHE) $$(PLATFORM_BIN)/clang++
_ios-$(1)_AC_VARS= \
ac_cv_func_shm_open_working_with_mmap=no \
$$(ios-$(1)_AC_VARS)
ac_cv_func_shm_open_working_with_mmap=no
_ios-$(1)_CFLAGS= \
-isysroot $$(XCODE_DIR)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$$(MACOS_VERSION).sdk -mmacosx-version-min=$$(MACOS_VERSION_MIN) \
-Qunused-arguments \
$$(ios-$(1)_CFLAGS)
-Qunused-arguments
_ios-$(1)_CXXFLAGS= \
-isysroot $$(XCODE_DIR)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$$(MACOS_VERSION).sdk -mmacosx-version-min=$$(MACOS_VERSION_MIN) \
-Qunused-arguments \
-stdlib=libc++ \
$$(ios-$(1)_CXXFLAGS)
-stdlib=libc++
_ios-$(1)_CPPFLAGS= \
-DMONOTOUCH=1 \
$$(ios-$(1)_CPPFLAGS)
-DMONOTOUCH=1
_ios-$(1)_LDFLAGS= \
$$(ios_LDFLAGS) \
-stdlib=libc++ \
$$(ios-$(1)_LDFLAGS)
-stdlib=libc++
_ios-$(1)_CONFIGURE_FLAGS= \
$$(ios-$(1)_CONFIGURE_FLAGS) \
--target=$(4) \
--cache-file=$$(TOP)/sdks/builds/ios-$(1)-$$(CONFIGURATION).config.cache \
--prefix=$$(TOP)/sdks/out/ios-$(1)-$$(CONFIGURATION) \
--disable-boehm \
--disable-btls \
--disable-iconv \
@@ -364,28 +336,13 @@ _ios-$(1)_CONFIGURE_FLAGS= \
--enable-dtrace=no \
--enable-icall-symbol-map \
--enable-minimal=com,remoting \
--with-cross-offsets=$(4).h \
--with-llvm=$$(TOP)/sdks/out/ios-$(3)
--disable-crash-reporting
.stamp-ios-$(1)-toolchain:
touch $$@
.stamp-ios-$(1)-$$(CONFIGURATION)-configure: | $(if $(IGNORE_PACKAGE_LLVM),package-llvm-$(3),download-llvm-$(3))
$$(TOP)/sdks/builds/ios-$(1)-$$(CONFIGURATION)/$(4).h: .stamp-ios-$(1)-$$(CONFIGURATION)-configure $$(TOP)/tools/offsets-tool/MonoAotOffsetsDumper.exe
cd $$(TOP)/sdks/builds/ios-$(1)-$$(CONFIGURATION) && \
MONO_PATH=$(TOP)/tools/offsets-tool/CppSharp/osx_64 \
mono --debug $$(TOP)/tools/offsets-tool/MonoAotOffsetsDumper.exe \
--gen-ios --abi $$(_ios-$(1)_OFFSET_TOOL_ABI) --outfile $$@ --mono $$(TOP) --targetdir $$(TOP)/sdks/builds/ios-$(1)-$$(CONFIGURATION)
build-ios-$(1): $$(TOP)/sdks/builds/ios-$(1)-$$(CONFIGURATION)/$(4).h
$$(eval $$(call RuntimeTemplate,ios-$(1)))
$$(eval $$(call CrossRuntimeTemplate,ios-$(1),$(2)-apple-darwin10,$(3)-darwin,$(4),$(5),$(6)))
endef
ios-cross32_CONFIGURE_FLAGS=--build=i386-apple-darwin10
ios-crosswatch_CONFIGURE_FLAGS=--build=i386-apple-darwin10 --enable-cooperative-suspend
$(eval $(call iOSCrossTemplate,cross32,arm,llvm36-32,arm-darwin,arm-apple-darwin10))
$(eval $(call iOSCrossTemplate,cross64,aarch64,llvm64,aarch64-darwin,aarch64-apple-darwin10))
$(eval $(call iOSCrossTemplate,crosswatch,armv7k,llvm36-32,armv7k-unknown-darwin,armv7k-apple-darwin))
$(eval $(call iOSCrossTemplate,cross32,i386,arm,ios-target32,llvm36-llvm32,arm-apple-darwin10))
$(eval $(call iOSCrossTemplate,cross64,x86_64,aarch64,ios-target64,llvm-llvm64,aarch64-apple-darwin10))
ios-crosswatch_CONFIGURE_FLAGS=--enable-cooperative-suspend
$(eval $(call iOSCrossTemplate,crosswatch,i386,armv7k-unknown,ios-targetwatch,llvm36-llvm32,armv7k-apple-darwin))
+157 -69
View File
@@ -1,31 +1,91 @@
LLVM_SRC?=$(TOP)/sdks/builds/toolchains/llvm
$(dir $(LLVM_SRC)):
mkdir -p $@
$(TOP)/sdks/builds/toolchains/llvm:
mkdir -p $(dir $@)
$(MAKE) -C $(TOP)/llvm -f build.mk $@/CMakeLists.txt \
LLVM_PATH="$@"
$(TOP)/sdks/out:
mkdir -p $@
.stamp-llvm-download: | setup-llvm-llvm32 setup-llvm-llvm64 $(TOP)/sdks/out
$(MAKE) -C $(TOP)/llvm -f build.mk download-llvm
$(RM) -r $(TOP)/sdks/out/ios-llvm32 $(TOP)/sdks/out/ios-llvm64
mv $(TOP)/llvm/llvm-tmp/usr32 $(TOP)/sdks/out/ios-llvm32
mv $(TOP)/llvm/llvm-tmp/usr64 $(TOP)/sdks/out/ios-llvm64
rm -rf $(TOP)/llvm/llvm-tmp
touch $@
$(LLVM_SRC)/CMakeLists.txt: | $(LLVM_SRC)
LLVM36_SRC?=$(TOP)/sdks/builds/toolchains/llvm36
$(dir $(LLVM36_SRC)):
mkdir -p $@
$(TOP)/sdks/builds/toolchains/llvm36:
mkdir -p $(dir $@)
git clone -b $(LLVM36_BRANCH) https://github.com/mono/llvm.git $@
cd $@ && git checkout $(LLVM36_HASH)
.stamp-llvm36-download: | $(TOP)/sdks/out
$(MAKE) -C $(TOP)/llvm -f build.mk download-llvm36
$(RM) -r $(TOP)/sdks/out/ios-llvm36-32
mv $(TOP)/llvm/llvm36-tmp/usr32 $(TOP)/sdks/out/ios-llvm36-32
cp $(TOP)/llvm/llvm36-tmp/usr64/bin/{llc,opt} $(TOP)/sdks/out/ios-llvm36-32/bin/
rm -rf $(TOP)/llvm/llvm36-tmp
$(LLVM36_SRC)/configure: | $(LLVM36_SRC)
.stamp-llvm-download:
ifeq ($(UNAME),Darwin)
ifeq ($(DISABLE_DOWNLOAD_LLVM),)
mkdir -p $(TOP)/sdks/builds/toolchains/llvm-download
$(MAKE) -C $(TOP)/llvm -f build.mk download-llvm \
LLVM_PREFIX="$(TOP)/sdks/builds/toolchains/llvm-download/usr"
touch $@
endif
endif
.stamp-llvm36-download:
ifeq ($(UNAME),Darwin)
ifeq ($(DISABLE_DOWNLOAD_LLVM),)
mkdir -p $(TOP)/sdks/builds/toolchains/llvm36-download
-wget --no-verbose -O - http://xamjenkinsartifact.blob.core.windows.net/$(LLVM36_JENKINS_LANE)/llvm-osx64-$(LLVM36_HASH).tar.gz | tar -xC $(TOP)/sdks/builds/toolchains/llvm36-download -f -
touch $@
endif
endif
##
# Parameters
# $(1): version
# $(2): target
# $(3): bitness
# $(4): configure script
define LLVMProvisionTemplate
ifeq ($(UNAME),Darwin)
.stamp-$(1)-$(2)-unpack:
cp -r $$(TOP)/sdks/builds/toolchains/$(1)-download/usr$(3)/* $$(TOP)/sdks/out/$(1)-$(2)
touch $$@
.PHONY: unpack-$(1)-$(2)
unpack-$(1)-$(2): .stamp-$(1)-$(2)-unpack
.PHONY: provision-$(1)-$(2)
provision-$(1)-$(2): .stamp-$(1)-download | setup-$(1)-$(2) $(4)
$$(MAKE) $$(if $$(wildcard $$(TOP)/sdks/builds/toolchains/$(1)-download/usr$(3)),unpack,package)-$(1)-$(2)
.PHONY: clean-$(1)-$(2)
clean-$(1)-$(2)::
rm -rf .stamp-$(1)-download .stamp-$(1)-$(2)-unpack $$(TOP)/sdks/builds/toolchains/$(1)-download $$(TOP)/sdks/out/$(1)-$(2)
else
.PHONY: provision-$(1)-$(2)
provision-$(1)-$(2): package-$(1)-$(2)
endif
.PHONY: provision
provision: provision-$(1)-$(2)
endef
$(eval $(call LLVMProvisionTemplate,llvm,llvm32,32,$(LLVM_SRC)/CMakeLists.txt))
$(eval $(call LLVMProvisionTemplate,llvm,llvm64,64,$(LLVM_SRC)/CMakeLists.txt))
$(eval $(call LLVMProvisionTemplate,llvm36,llvm32,32,$(LLVM36_SRC)/configure))
##
# Parameters
# $(1): version
# $(2): target
# $(3): bitness
# $(4): configure script
define LLVMMXEProvisionTemplate
.PHONY: provision-$(1)-$(2)
provision-$(1)-$(2): | package-$(1)-$(2) $(4)
.PHONY: provision
provision: provision-$(1)-$(2)
endef
$(eval $(call LLVMMXEProvisionTemplate,llvm,llvmwin32,32,$(LLVM_SRC)/CMakeLists.txt))
$(eval $(call LLVMMXEProvisionTemplate,llvm,llvmwin64,64,$(LLVM_SRC)/CMakeLists.txt))
##
# Parameters
@@ -37,52 +97,87 @@ $(dir $(LLVM36_SRC)):
define LLVMTemplate
_llvm-$(1)_CMAKE_ARGS = \
$$(if $$(llvm-$(1)_CC),-DCMAKE_C_FLAGS="$$(wordlist 2,$$(words $$(llvm-$(1)_CC)),$$(llvm-$(1)_CC))") \
$$(if $$(llvm-$(1)_CXX),-DCMAKE_CXX_FLAGS="$$(wordlist 2,$$(words $$(llvm-$(1)_CXX)),$$(llvm-$(1)_CXX))") \
$$(if $$(llvm-$(1)_CFLAGS),-DCMAKE_C_FLAGS="$$(llvm-$(1)_CFLAGS)") \
$$(if $$(llvm-$(1)_CXXFLAGS),-DCMAKE_CXX_FLAGS="$$(llvm-$(1)_CXXFLAGS)") \
$$(llvm-$(1)_CMAKE_ARGS)
.stamp-llvm-$(1)-toolchain:
touch $$@
.stamp-llvm-$(1)-configure: | $$(dir $(3))
touch $$@
.PHONY: build-custom-llvm-$(1)
build-custom-llvm-$(1):
.PHONY: setup-llvm-$(1)
setup-llvm-$(1):
mkdir -p $$(TOP)/sdks/out/llvm-$(1)
.PHONY: package-llvm-$(1)
package-llvm-$(1): | $$(dir $(3))
package-llvm-$(1): setup-llvm-$(1) $$(LLVM_SRC)/CMakeLists.txt
$$(MAKE) -C $$(TOP)/llvm -f build.mk install-llvm \
LLVM_PATH="$(3)" \
LLVM36_PATH="$(3)" \
LLVM_PATH="$$(LLVM_SRC)" \
LLVM_BUILD="$$(TOP)/sdks/builds/llvm-$(1)" \
LLVM_PREFIX="$$(TOP)/sdks/out/ios-$(1)" \
LLVM_CMAKE_ARGS="$$(_llvm-$(1)_CMAKE_ARGS)" \
LLVM_RELEASE="$(5)"
.PHONY: download-llvm-$(1)
download-llvm-$(1): $(4)
LLVM_PREFIX="$$(TOP)/sdks/out/llvm-$(1)" \
LLVM_CMAKE_ARGS="$$(_llvm-$(1)_CMAKE_ARGS)"
.PHONY: clean-llvm-$(1)
clean-llvm-$(1):
clean-llvm-$(1)::
$$(MAKE) -C $$(TOP)/llvm -f build.mk clean-llvm \
LLVM_PATH="$(3)" \
LLVM_PATH="$$(LLVM_SRC)" \
LLVM_BUILD="$$(TOP)/sdks/builds/llvm-$(1)" \
LLVM_PREFIX="$$(TOP)/sdks/out/ios-$(1)"
TARGETS += llvm-$(1)
LLVM_PREFIX="$$(TOP)/sdks/out/llvm-$(1)"
endef
# Older llvm version used to target 32 bit platforms (ios 32 bit/watchos)
llvm-llvm36-32_CMAKE_ARGS=-DLLVM_BUILD_32_BITS=On
$(eval $(call LLVMTemplate,llvm36-32,i386,$(LLVM36_SRC),.stamp-llvm36-download,llvm36))
llvm-llvm32_CMAKE_FLAGS=-DLLVM_BUILD_32_BITS=On
$(eval $(call LLVMTemplate,llvm32,i386))
$(eval $(call LLVMTemplate,llvm64,x86_64))
llvm-llvm32_CMAKE_ARGS=-DLLVM_BUILD_32_BITS=On
$(eval $(call LLVMTemplate,llvm32,i386,$(LLVM_SRC),.stamp-llvm-download,llvm))
$(eval $(call LLVMTemplate,llvm64,x86_64,$(LLVM_SRC),.stamp-llvm-download,llvm))
##
# Parameters
# $(1): target
# $(2): arch
define LLVM36Template
_llvm36-$(1)_CFLAGS=
_llvm36-$(1)_CXXFLAGS= \
$$(if $$(filter $$(UNAME),Darwin),-mmacosx-version-min=10.9 -stdlib=libc++)
_llvm36-$(1)_LDFLAGS= \
$$(if $$(filter $$(UNAME),Darwin),-mmacosx-version-min=10.9)
_llvm36-$(1)_CONFIGURE_ENVIRONMENT= \
$$(if $$(llvm36-$(1)_CC),CC="$$(llvm36-$(1)_CC)") \
$$(if $$(llvm36-$(1)_CXX),CXX="$$(llvm36-$(1)_CXX)") \
CFLAGS="$$(_llvm36-$(1)_CFLAGS)" \
CXXFLAGS="$$(_llvm36-$(1)_CXXFLAGS)" \
LDFLAGS="$$(_llvm36-$(1)_LDFLAGS)"
_llvm36-$(1)_CONFIGURE_FLAGS= \
--host=$$(if $$(filter $$(UNAME),Darwin),$(2)-apple-darwin10,$$(if $$(filter $$(UNAME),Linux),$(2)-linux-gnu,$$(error "Unknown UNAME='$$(UNAME)'"))) \
--cache-file=$$(TOP)/sdks/builds/llvm36-$(1).config.cache \
--prefix=$$(TOP)/sdks/out/llvm36-$(1) \
--enable-assertions=no \
--enable-optimized \
--enable-targets="arm,aarch64,x86" \
$$(if $$(filter $$(UNAME),Darwin),--enable-libcpp)
.stamp-llvm36-$(1)-configure: $$(LLVM36_SRC)/configure
mkdir -p $$(TOP)/sdks/builds/llvm36-$(1)
cd $$(TOP)/sdks/builds/llvm36-$(1) && $$< $$(_llvm36-$(1)_CONFIGURE_ENVIRONMENT) $$(_llvm36-$(1)_CONFIGURE_FLAGS)
touch $$@
.PHONY: setup-llvm36-$(1)
setup-llvm36-$(1):
mkdir -p $$(TOP)/sdks/out/llvm36-$(1)
.PHONY: build-llvm36-$(1)
build-llvm36-$(1): .stamp-llvm36-$(1)-configure
$$(MAKE) -C $$(TOP)/sdks/builds/llvm36-$(1)
.PHONY: package-llvm36-$(1)
package-llvm36-$(1): setup-llvm36-$(1) build-llvm36-$(1)
$$(MAKE) -C $$(TOP)/sdks/builds/llvm36-$(1) install
.PHONY: clean-llvm36-$(1)
clean-llvm36-$(1)::
rm -rf .stamp-llvm36-$(1)-configure $$(TOP)/sdks/builds/llvm36-$(1) $$(TOP)/sdks/builds/llvm36-$(1).config.cache $$(TOP)/sdks/out/llvm36-$(1)
endef
$(eval $(call LLVM36Template,llvm32,i386))
##
# Parameters
@@ -90,7 +185,7 @@ $(eval $(call LLVMTemplate,llvm64,x86_64,$(LLVM_SRC),.stamp-llvm-download,llvm))
# $(2): arch
define LLVMMxeTemplate
_llvm-$(1)_CMAKE=$$(MXE_PREFIX)/bin/$(2)-w64-mingw32$$(if $$(filter $(UNAME),Darwin),.static)-cmake
_llvm-$(1)_CMAKE=$$(MXE_PREFIX)/bin/$(2)-w64-mingw32$$(if $$(filter $$(UNAME),Darwin),.static)-cmake
# -DCROSS_TOOLCHAIN_FLAGS_NATIVE is needed to compile the native tools (tlbgen) using the host compilers
# -DLLVM_ENABLE_THREADS=0 is needed because mxe doesn't define std::mutex etc.
@@ -101,33 +196,26 @@ _llvm-$(1)_CMAKE_ARGS = \
-DLLVM_BUILD_EXECUTION_ENGINE=Off \
$$(llvm-$(1)_CMAKE_ARGS)
.stamp-llvm-$(1)-toolchain:
touch $$@
.stamp-llvm-$(1)-configure:
touch $$@
.PHONY: build-custom-llvm-$(1)
build-custom-llvm-$(1):
.PHONY: setup-llvm-$(1)
setup-llvm-$(1):
mkdir -p $$(TOP)/sdks/out/llvm-$(1)
.PHONY: package-llvm-$(1)
package-llvm-$(1): | $$(dir $(LLVM_SRC))
package-llvm-$(1): setup-llvm-$(1) $$(LLVM_SRC)/CMakeLists.txt
$$(MAKE) -C $$(TOP)/llvm -f build.mk install-llvm \
CMAKE=$$(_llvm-$(1)_CMAKE) \
LLVM_PATH="$(LLVM_SRC)" \
LLVM_PATH="$$(LLVM_SRC)" \
LLVM_BUILD="$$(TOP)/sdks/builds/llvm-$(1)" \
LLVM_PREFIX="$$(TOP)/sdks/out/ios-$(1)" \
LLVM_PREFIX="$$(TOP)/sdks/out/llvm-$(1)" \
LLVM_CMAKE_ARGS="$$(_llvm-$(1)_CMAKE_ARGS)"
.PHONY: clean-llvm-$(1)
clean-llvm-$(1):
clean-llvm-$(1)::
$$(MAKE) -C $$(TOP)/llvm -f build.mk clean-llvm \
CMAKE=$$(_llvm-$(1)_CMAKE) \
LLVM_PATH="$(LLVM_SRC)" \
LLVM_PATH="$$(LLVM_SRC)" \
LLVM_BUILD="$$(TOP)/sdks/builds/llvm-$(1)" \
LLVM_PREFIX="$$(TOP)/sdks/out/ios-$(1)"
TARGETS += llvm-$(1)
LLVM_PREFIX="$$(TOP)/sdks/out/llvm-$(1)"
endef
+3
View File
@@ -28,3 +28,6 @@ $(MXE_PREFIX)/.stamp:
.PHONY: provision-mxe
provision-mxe: $(MXE_PREFIX)/.stamp
endif
.PHONY: provision
provision: provision-mxe
+81 -13
View File
@@ -2,6 +2,7 @@
##
# Parameters:
# $(1): target
# $(2): host triple
#
# Flags:
# _$(1)_AR
@@ -24,12 +25,15 @@
# _$(1)_PATH
define RuntimeTemplate
__$(1)_CFLAGS=$(if $(RELEASE),-O2 -g,-O0 -ggdb3 -fno-omit-frame-pointer) $$(_$(1)_CFLAGS)
__$(1)_CXXFLAGS=$(if $(RELEASE),-O2 -g,-O0 -ggdb3 -fno-omit-frame-pointer) $$(_$(1)_CXXFLAGS)
__$(1)_CPPFLAGS=$(if $(RELEASE),-O2 -g,-O0 -ggdb3 -fno-omit-frame-pointer) $$(_$(1)_CPPFLAGS)
__$(1)_CXXCPPFLAGS=$(if $(RELEASE),-O2 -g,-O0 -ggdb3 -fno-omit-frame-pointer) $$(_$(1)_CXXCPPFLAGS)
_runtime_$(1)_CFLAGS=$(if $(RELEASE),-O2 -g,-O0 -ggdb3 -fno-omit-frame-pointer) $$(_$(1)_CFLAGS) $$($(1)_CFLAGS)
_runtime_$(1)_CXXFLAGS=$(if $(RELEASE),-O2 -g,-O0 -ggdb3 -fno-omit-frame-pointer) $$(_$(1)_CXXFLAGS) $$($(1)_CXXFLAGS)
_runtime_$(1)_CPPFLAGS=$(if $(RELEASE),-O2 -g,-O0 -ggdb3 -fno-omit-frame-pointer) $$(_$(1)_CPPFLAGS) $$($(1)_CPPFLAGS)
_runtime_$(1)_CXXCPPFLAGS=$(if $(RELEASE),-O2 -g,-O0 -ggdb3 -fno-omit-frame-pointer) $$(_$(1)_CXXCPPFLAGS) $$($(1)_CXXCPPFLAGS)
_runtime_$(1)_LDFLAGS=$$(_$(1)_LDFLAGS) $$($(1)_LDFLAGS)
__$(1)_CONFIGURE_ENVIRONMENT = \
_runtime_$(1)_AC_VARS=$$(_$(1)_AC_VARS) $$($(1)_AC_VARS)
_runtime_$(1)_CONFIGURE_ENVIRONMENT = \
$(if $$(_$(1)_AR),AR="$$(_$(1)_AR)") \
$(if $$(_$(1)_AS),AS="$$(_$(1)_AS)") \
$(if $$(_$(1)_CC),CC="$$(_$(1)_CC)") \
@@ -41,18 +45,25 @@ __$(1)_CONFIGURE_ENVIRONMENT = \
$(if $$(_$(1)_OBJDUMP),OBJDUMP="$$(_$(1)_OBJDUMP)") \
$(if $$(_$(1)_RANLIB),RANLIB="$$(_$(1)_RANLIB)") \
$(if $$(_$(1)_STRIP),STRIP="$$(_$(1)_STRIP)") \
CFLAGS="$$(__$(1)_CFLAGS)" \
CXXFLAGS="$$(__$(1)_CXXFLAGS)" \
CPPFLAGS="$$(__$(1)_CPPFLAGS)" \
CXXCPPFLAGS="$$(__$(1)_CXXCPPFLAGS)" \
$(if $$(_$(1)_LDFLAGS),LDFLAGS="$$(_$(1)_LDFLAGS)") \
$$(_$(1)_CONFIGURE_ENVIRONMENT)
CFLAGS="$$(_runtime_$(1)_CFLAGS)" \
CXXFLAGS="$$(_runtime_$(1)_CXXFLAGS)" \
CPPFLAGS="$$(_runtime_$(1)_CPPFLAGS)" \
CXXCPPFLAGS="$$(_runtime_$(1)_CXXCPPFLAGS)" \
LDFLAGS="$$(_runtime_$(1)_LDFLAGS)" \
$$(_$(1)_CONFIGURE_ENVIRONMENT) \
$$($(1)_CONFIGURE_ENVIRONMENT)
__$(1)_CONFIGURE_FLAGS= --disable-crash-reporting $$(_$(1)_CONFIGURE_FLAGS)
_runtime_$(1)_CONFIGURE_FLAGS= \
$$(if $(2),--host=$(2)) \
--cache-file=$$(TOP)/sdks/builds/$(1)-$$(CONFIGURATION).config.cache \
--prefix=$$(TOP)/sdks/out/$(1)-$$(CONFIGURATION) \
$$(_cross-runtime_$(1)_CONFIGURE_FLAGS) \
$$(_$(1)_CONFIGURE_FLAGS) \
$$($(1)_CONFIGURE_FLAGS)
.stamp-$(1)-$$(CONFIGURATION)-configure: $$(TOP)/configure .stamp-$(1)-toolchain
mkdir -p $$(TOP)/sdks/builds/$(1)-$$(CONFIGURATION)
$(if $$(_$(1)_PATH),PATH="$$$$PATH:$$(_$(1)_PATH)") ./wrap-configure.sh $$(TOP)/sdks/builds/$(1)-$$(CONFIGURATION) $(abspath $(TOP)/configure) $$(_$(1)_AC_VARS) $$(__$(1)_CONFIGURE_ENVIRONMENT) $$(__$(1)_CONFIGURE_FLAGS)
$(if $$(_$(1)_PATH),PATH="$$$$PATH:$$(_$(1)_PATH)") ./wrap-configure.sh $$(TOP)/sdks/builds/$(1)-$$(CONFIGURATION) $$(abspath $$<) $$(_runtime_$(1)_AC_VARS) $$(_runtime_$(1)_CONFIGURE_ENVIRONMENT) $$(_runtime_$(1)_CONFIGURE_FLAGS)
touch $$@
.PHONY: .stamp-$(1)-configure
@@ -86,3 +97,60 @@ clean-$(1):
TARGETS += $(1)
endef
$(TOP)/tools/offsets-tool/MonoAotOffsetsDumper.exe: $(wildcard $(TOP)/tools/offsets-tool/*.cs)
$(MAKE) -C $(dir $@) MonoAotOffsetsDumper.exe
##
# Parameters:
# $(1): target
# $(2): host triple
# $(3): target triple
# $(4): device target
# $(5): llvm
# $(6): offsets dumper abi
#
# Flags:
# _$(1)_AR
# _$(1)_AS
# _$(1)_CC
# _$(1)_CPP
# _$(1)_CXX
# _$(1)_CXXCPP
# _$(1)_DLLTOOL
# _$(1)_LD
# _$(1)_OBJDUMP
# _$(1)_RANLIB
# _$(1)_STRIP
# _$(1)_CFLAGS
# _$(1)_CXXFLAGS
# _$(1)_CPPFLAGS
# _$(1)_LDFLAGS
# _$(1)_AC_VARS
# _$(1)_CONFIGURE_FLAGS
# _$(1)_PATH
# _$(1)_OFFSETS_DUMPER_ARGS
define CrossRuntimeTemplate
_cross-runtime_$(1)_CONFIGURE_FLAGS= \
--target=$(3) \
--with-cross-offsets=$(3).h \
--with-llvm=$$(TOP)/sdks/out/$(5)
.stamp-$(1)-toolchain:
touch $$@
.stamp-$(1)-$$(CONFIGURATION)-configure: | $$(if $$(IGNORE_PROVISION_LLVM),,provision-$(5))
$$(TOP)/sdks/builds/$(1)-$$(CONFIGURATION)/$(3).h: .stamp-$(1)-$$(CONFIGURATION)-configure $$(TOP)/tools/offsets-tool/MonoAotOffsetsDumper.exe | configure-$(4)
cd $$(TOP)/sdks/builds/$(1)-$$(CONFIGURATION) && \
MONO_PATH=$$(TOP)/tools/offsets-tool/CppSharp/$$(if $$(filter $$(UNAME),Darwin),osx_32,$$(if $$(filter $$(UNAME),Linux),linux_64,$$(error "Unknown UNAME='$$(UNAME)'"))) \
mono $$(if $$(filter $$(UNAME),Darwin),--arch=32) --debug "$$(TOP)/tools/offsets-tool/MonoAotOffsetsDumper.exe" \
--abi $(6) --outfile "$$@" --mono "$$(TOP)" --targetdir "$$(TOP)/sdks/builds/$(4)-$$(CONFIGURATION)" \
$$(_$(1)_OFFSETS_DUMPER_ARGS)
build-$(1): $$(TOP)/sdks/builds/$(1)-$$(CONFIGURATION)/$(3).h
$$(eval $$(call RuntimeTemplate,$(1),$(2)))
endef
+1 -1
View File
@@ -161,7 +161,7 @@ public class AppBuilder
aot_args += ",soft-debug";
if (isllvm) {
cross_runtime_args = "--llvm";
aot_args += ",llvm-path=$mono_sdkdir/ios-llvm64/bin,llvm-outfile=$llvm_outfile";
aot_args += ",llvm-path=$mono_sdkdir/llvm-llvm64/bin,llvm-outfile=$llvm_outfile";
}
Directory.CreateDirectory (builddir);
+6
View File
@@ -3,6 +3,12 @@
MXE_HASH?=b9cbb53541a0e10fe4fe81f22bd586cb9cdc922a
# LLVM
LLVM36_BRANCH=master
LLVM36_HASH?=acb33f3436e7dd5b6588c9f044d012846c4d55c4
LLVM36_JENKINS_LANE=build-package-osx-llvm
# Android
ANDROID_BUILD_TOOLS_VERSION?=27
+3 -1
View File
@@ -30,6 +30,7 @@ namespace CppSharp
static string MaccoreDir = @"";
static string TargetDir = @"";
static bool GenIOS;
static bool GenAndroid;
public enum TargetPlatform
{
@@ -221,7 +222,7 @@ namespace CppSharp
MonodroidDir = Path.Combine (monodroidDir);
}
if (Directory.Exists (MonodroidDir))
if (Directory.Exists (MonodroidDir) || GenAndroid)
SetupAndroidTargets();
string maccoreDir;
@@ -304,6 +305,7 @@ namespace CppSharp
{ "targetdir=", "Path to the directory containing the mono build", v =>TargetDir = v },
{ "mono=", "include directory", v => MonoDir = v },
{ "gen-ios", "generate iOS offsets", v => GenIOS = v != null },
{ "gen-android", "generate Android offsets", v => GenAndroid = v != null },
{ "h|help", "show this message and exit", v => showHelp = v != null },
};