diff options
| -rw-r--r-- | sdks/builds/ios.mk | 12 | ||||
| -rw-r--r-- | sdks/builds/mac.mk | 10 |
2 files changed, 16 insertions, 6 deletions
diff --git a/sdks/builds/ios.mk b/sdks/builds/ios.mk index 468f67edabf..73d4fd1e24d 100644 --- a/sdks/builds/ios.mk +++ b/sdks/builds/ios.mk @@ -12,10 +12,12 @@ ios_FRAMEWORKS_DIR = $(TOP)/sdks/out/ios-frameworks ios_LIBS_DIR = $(TOP)/sdks/out/ios-libs -ios_ARCHIVE += ios-frameworks ios-libs -ios_PLATFORM_BIN=$(XCODE_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/bin +ios_MONO_VERSION = $(TOP)/sdks/out/ios-mono-version.txt + +ios_ARCHIVE += ios-frameworks ios-libs ios-mono-version.txt +ADDITIONAL_PACKAGE_DEPS += $(ios_FRAMEWORKS_DIR) $(ios_LIBS_DIR) $(ios_MONO_VERSION) -ADDITIONAL_PACKAGE_DEPS += $(ios_FRAMEWORKS_DIR) $(ios_LIBS_DIR) +ios_PLATFORM_BIN=$(XCODE_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/bin ## # Device builds @@ -554,6 +556,10 @@ $(ios_LIBS_DIR): package-ios-target32 package-ios-target32s package-ios-target64 $(ios_PLATFORM_BIN)/dsymutil -t 4 -o $(ios_LIBS_DIR)/watchos-sim/libmono-native-compat.dylib.dSYM $(ios_LIBS_DIR)/watchos-sim/libmono-native-compat.dylib $(ios_PLATFORM_BIN)/dsymutil -t 4 -o $(ios_LIBS_DIR)/watchos-sim/libmono-native-unified.dylib.dSYM $(ios_LIBS_DIR)/watchos-sim/libmono-native-unified.dylib + +$(ios_MONO_VERSION): $(TOP)/configure.ac + grep AC_INIT $(TOP)/configure.ac | sed -e 's/.*\[//' -e 's/\].*//' > $@ + ## # BCL builds ## diff --git a/sdks/builds/mac.mk b/sdks/builds/mac.mk index e78732116e1..a5bd3e6e75a 100644 --- a/sdks/builds/mac.mk +++ b/sdks/builds/mac.mk @@ -2,9 +2,10 @@ mac_BIN_DIR = $(TOP)/sdks/out/mac-bin mac_PKG_CONFIG_DIR = $(TOP)/sdks/out/mac-pkgconfig mac_LIBS_DIR = $(TOP)/sdks/out/mac-libs -mac_ARCHIVE += mac-bin mac-pkgconfig mac-libs +mac_MONO_VERSION = $(TOP)/sdks/out/mac-mono-version.txt -ADDITIONAL_PACKAGE_DEPS += $(mac_BIN_DIR) $(mac_PKG_CONFIG_DIR) $(mac_LIBS_DIR) +mac_ARCHIVE += mac-bin mac-pkgconfig mac-libs mac-mono-version.txt +ADDITIONAL_PACKAGE_DEPS += $(mac_BIN_DIR) $(mac_PKG_CONFIG_DIR) $(mac_LIBS_DIR) $(mac_MONO_VERSION) ## # Parameters @@ -84,8 +85,11 @@ $(mac_LIBS_DIR): package-mac-mac32 package-mac-mac64 $(mac_mac64_PLATFORM_BIN)/lipo $(TOP)/sdks/out/mac-mac32-$(CONFIGURATION)/lib/libmono-native-compat.a $(TOP)/sdks/out/mac-mac64-$(CONFIGURATION)/lib/libmono-native-compat.a -create -output $(mac_LIBS_DIR)/libmono-native-compat.a $(mac_mac64_PLATFORM_BIN)/lipo $(TOP)/sdks/out/mac-mac32-$(CONFIGURATION)/lib/libmono-native-unified.a $(TOP)/sdks/out/mac-mac64-$(CONFIGURATION)/lib/libmono-native-unified.a -create -output $(mac_LIBS_DIR)/libmono-native-unified.a $(mac_mac64_PLATFORM_BIN)/lipo $(TOP)/sdks/out/mac-mac32-$(CONFIGURATION)/lib/libmono-profiler-log.a $(TOP)/sdks/out/mac-mac64-$(CONFIGURATION)/lib/libmono-profiler-log.a -create -output $(mac_LIBS_DIR)/libmono-profiler-log.a - + $(mac_mac64_PLATFORM_BIN)/install_name_tool -id @rpath/libmonosgen-2.0.dylib $(mac_LIBS_DIR)/libmonosgen-2.0.dylib $(mac_mac64_PLATFORM_BIN)/install_name_tool -id @rpath/libmono-native-compat.dylib $(mac_LIBS_DIR)/libmono-native-compat.dylib $(mac_mac64_PLATFORM_BIN)/install_name_tool -id @rpath/libmono-native-unified.dylib $(mac_LIBS_DIR)/libmono-native-unified.dylib $(mac_mac64_PLATFORM_BIN)/install_name_tool -id @rpath/libMonoPosixHelper.dylib $(mac_LIBS_DIR)/libMonoPosixHelper.dylib + +$(mac_MONO_VERSION): $(TOP)/configure.ac + grep AC_INIT $(TOP)/configure.ac | sed -e 's/.*\[//' -e 's/\].*//' > $@ |