Created
September 27, 2016 18:08
-
-
Save rolfbjarne/0d4305b485d31c467a52547b2e02743f to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| commit 08856883b945ca5b8ea1086da7c3dd23cf600664 | |
| Author: Rolf Bjarne Kvinge <rolf@xamarin.com> | |
| Date: Tue Sep 27 18:16:31 2016 +0200 | |
| [builds] Apply magic to make us build on Sierra. | |
| diff --git a/builds/Makefile b/builds/Makefile | |
| index bfcf7a1..74132ef 100644 | |
| --- a/builds/Makefile | |
| +++ b/builds/Makefile | |
| @@ -18,6 +18,8 @@ ifndef DISABLE_STRIP | |
| INSTALL_STRIP_FLAG=-s | |
| endif | |
| +COMMON_LDFLAGS="-Wl,-no_weak_imports" | |
| + | |
| BITCODE_CFLAGS=-fexceptions | |
| BITCODE_LDFLAGS=-framework CoreFoundation -lobjc -lc++ | |
| BITCODE_CONFIGURE_FLAGS=--enable-llvm-runtime --with-bitcode=yes | |
| @@ -159,6 +161,7 @@ $(2)_CPPFLAGS = \ | |
| -mmacosx-version-min=$(MIN_OSX_SDK_VERSION) | |
| $(2)_CFLAGS = -O2 -arch $(1) | |
| $(2)_CXXFLAGS = -O2 -arch $(1) | |
| +$(2)_LDFLAGS = $(COMMON_LDFLAGS) | |
| $(2)_CONFIGURE_FLAGS = \ | |
| --prefix=$$(BUILD_DESTDIR)/$(2) \ | |
| --host=$(1)-apple-darwin10 \ | |
| @@ -172,11 +175,17 @@ $(2)_CONFIGURE_FLAGS = \ | |
| --disable-boehm \ | |
| $(XAMARIN_CONFIGURE_FLAGS) \ | |
| +$(2)_ACVARS = \ | |
| + ac_cv_func_fstatat=no \ | |
| + ac_cv_func_readlinkat=no \ | |
| + | |
| $(2)_CONFIGURE_ENVIRONMENT = \ | |
| + $$($(2)_ACVARS) \ | |
| PATH="$(MONO_PREFIX)/bin:$(PATH)" \ | |
| CPPFLAGS="$$($(2)_CPPFLAGS)" \ | |
| CFLAGS="$$($(2)_CFLAGS)" \ | |
| CXXFLAGS="$$($(2)_CXXFLAGS)" \ | |
| + LDFLAGS="$$($(2)_LDFLAGS)" \ | |
| CC="$(MAC_CC)" \ | |
| CXX="$(MAC_CXX)" \ | |
| DEVELOPER_DIR="$(XCODE_DEVELOPER_ROOT)" \ | |
| @@ -352,7 +361,7 @@ $(IOS_DESTDIR)/$(MONOTOUCH_PREFIX)/bin/smcs: | |
| # | |
| TOOLS64_CFLAGS=-arch x86_64 -mmacosx-version-min=$(MIN_OSX_SDK_VERSION) | |
| TOOLS64_CXXFLAGS=-arch x86_64 -mmacosx-version-min=$(MIN_OSX_SDK_VERSION) | |
| -TOOLS64_LDFLAGS=-arch x86_64 -mmacosx-version-min=$(MIN_OSX_SDK_VERSION) | |
| +TOOLS64_LDFLAGS=-arch x86_64 -mmacosx-version-min=$(MIN_OSX_SDK_VERSION) $(COMMON_LDFLAGS) | |
| TOOLS64_CONFIGURE_FLAGS= --build=x86_64-apple-darwin10 \ | |
| --with-monotouch_tv=yes \ | |
| @@ -373,7 +382,12 @@ TOOLS64_CONFIGURE_FLAGS= --build=x86_64-apple-darwin10 \ | |
| --disable-boehm \ | |
| $(XAMARIN_CONFIGURE_FLAGS) \ | |
| +TOOLS64_ACVARS = \ | |
| + ac_cv_func_fstatat=no \ | |
| + ac_cv_func_readlinkat=no \ | |
| + | |
| TOOLS64_CONFIGURE_ENVIRONMENT = \ | |
| + $(TOOLS64_ACVARS) \ | |
| CFLAGS="$(TOOLS64_CFLAGS)" \ | |
| CXXFLAGS="$(TOOLS64_CXXFLAGS)" \ | |
| LDFLAGS="$(TOOLS64_LDFLAGS)" \ | |
| @@ -446,7 +460,11 @@ endif | |
| WATCHBCL_CFLAGS=-arch x86_64 -mmacosx-version-min=$(MIN_OSX_SDK_VERSION) | |
| WATCHBCL_CXXFLAGS=-arch x86_64 -mmacosx-version-min=$(MIN_OSX_SDK_VERSION) | |
| -WATCHBCL_LDFLAGS=-arch x86_64 -mmacosx-version-min=$(MIN_OSX_SDK_VERSION) | |
| +WATCHBCL_LDFLAGS=-arch x86_64 -mmacosx-version-min=$(MIN_OSX_SDK_VERSION) $(COMMON_LDFLAGS) | |
| +WATCHBCL_ACVARS = \ | |
| + ac_cv_func_fstatat=no \ | |
| + ac_cv_func_readlinkat=no \ | |
| + | |
| WATCHBCL_CONFIGURE_FLAGS= --build=x86_64-apple-darwin10 \ | |
| --prefix=$(BUILD_DESTDIR)/watchbcl \ | |
| @@ -469,6 +487,7 @@ WATCHBCL_CONFIGURE_FLAGS= --build=x86_64-apple-darwin10 \ | |
| --enable-extension-module | |
| WATCHBCL_CONFIGURE_ENVIRONMENT = \ | |
| + $(WATCHBCL_ACVARS) \ | |
| CFLAGS="$(WATCHBCL_CFLAGS)" \ | |
| CXXFLAGS="$(WATCHBCL_CXXFLAGS)" \ | |
| LDFLAGS="$(WATCHBCL_LDFLAGS)" \ | |
| @@ -799,19 +818,31 @@ verify-signature: | |
| # usage $(call SimulatorBuildTemplate (x86_64,simulator64)) | |
| +# ld: weak import of symbol '_fstatat' not supported because of option: -no_weak_imports for architecture x86_64 | |
| +# according to 'man fstatat' it appeared in OS X 10.10 (iOS 8) | |
| +# ld: weak import of symbol '_readlinkat' not supported because of option: -no_weak_imports for architecture x86_64 | |
| +# according to 'man readlinkat' it appeared in OS X 10.10 (iOS 8) | |
| + | |
| SIM_BIN=$(SIMULATOR_BIN_PATH) | |
| +SIM_ACVARS = \ | |
| + ac_cv_func_clock_nanosleep=no \ | |
| + mono_cv_uscore=yes \ | |
| + ac_cv_func_fstatat=no \ | |
| + ac_cv_func_readlinkat=no \ | |
| define SimulatorBuildTemplate | |
| $(eval SIM$(2)_CPPFLAGS=-arch $(1) -O2 -DMONOTOUCH -DHOST_IOS -Wl,-application_extension -mios-simulator-version-min=$(MIN_IOS_SDK_VERSION) -isysroot $(SIMULATOR_SDK)) | |
| $(eval SIM$(2)_CFLAGS=$(SIM$(2)_CPPFLAGS) $(SIMULATOR_BUILD_CFLAGS)) | |
| $(eval SIM$(2)_CXXFLAGS=$(SIM$(2)_CPPFLAGS)) | |
| +$(eval SIM$(2)_LDFLAGS=$(COMMON_LDFLAGS)) | |
| $(eval SIM$(2)_CONFIGURE_FLAGS= --host=$(1)-apple-darwin10 \ | |
| --cache-file=../$(2).config.cache \ | |
| --enable-maintainer-mode \ | |
| --prefix=$(BUILD_DESTDIR)/$(2) \ | |
| --with-glib=embedded \ | |
| --without-ikvm-native \ | |
| + --with-tls=pthread \ | |
| --enable-minimal=com,remoting,shared_perfcounters \ | |
| --disable-mcs-build \ | |
| --disable-nls \ | |
| @@ -823,10 +854,12 @@ $(eval SIM$(2)_CONFIGURE_FLAGS= --host=$(1)-apple-darwin10 \ | |
| ) | |
| $(eval SIM$(2)_CONFIGURE_ENVIRONMENT= \ | |
| + $(SIM_ACVARS) \ | |
| PATH="$(SIM_BIN):$(PATH)" \ | |
| CPPFLAGS="$(SIM$(2)_CPPFLAGS)" \ | |
| CFLAGS="$(SIM$(2)_CFLAGS)" \ | |
| CXXFLAGS="$(SIM$(2)_CXXFLAGS)" \ | |
| + LDFLAGS="$(SIM$(2)_LDFLAGS)" \ | |
| CC="$(XCODE_CC)" \ | |
| CXX="$(XCODE_CXX)") | |
| @@ -943,12 +976,14 @@ WATCHSIMULATOR_FLAGS = \ | |
| WATCHSIMULATOR_CPPFLAGS = $(WATCHSIMULATOR_FLAGS) | |
| WATCHSIMULATOR_CFLAGS = $(WATCHSIMULATOR_FLAGS) | |
| WATCHSIMULATOR_CXXFLAGS = $(WATCHSIMULATOR_FLAGS) | |
| +WATCHSIMULATOR_LDFLAGS = $(COMMON_LDFLAGS) | |
| WATCHSIMULATOR_CONFIGURE_FLAGS = \ | |
| --host=i386-apple-darwin10 \ | |
| --disable-boehm \ | |
| --disable-executables \ | |
| --cache-file=../watchsimulator.config.cache \ | |
| --enable-maintainer-mode \ | |
| + --with-tls=pthread \ | |
| --prefix=$(BUILD_DESTDIR)/watchsimulator \ | |
| --with-glib=embedded \ | |
| --with-cooperative-gc=yes \ | |
| @@ -965,6 +1000,8 @@ WATCHSIMULATOR_CONFIGURE_FLAGS += \ | |
| --enable-checked-build=gc \ | |
| WATCHSIMULATOR_ACVARS = \ | |
| + mono_cv_uscore=yes \ | |
| + ac_cv_func_clock_nanosleep=no \ | |
| ac_cv_func_system=no \ | |
| ac_cv_func_pthread_kill=no \ | |
| ac_cv_func_kill=no \ | |
| @@ -983,6 +1020,7 @@ WATCHSIMULATOR_ENVIRONMENT = \ | |
| CPPFLAGS="$(WATCHSIMULATOR_CPPFLAGS)" \ | |
| CFLAGS="$(WATCHSIMULATOR_CFLAGS)" \ | |
| CXXFLAGS="$(WATCHSIMULATOR_CXXFLAGS)" \ | |
| + LDFLAGS="$(WATCHSIMULATOR_LDFLAGS)" \ | |
| DEVELOPER_DIR=$(XCODE_DEVELOPER_ROOT) \ | |
| ifdef INCLUDE_WATCH | |
| @@ -1080,6 +1118,7 @@ TVSIMULATOR_FLAGS = \ | |
| TVSIMULATOR_CPPFLAGS = $(TVSIMULATOR_FLAGS) | |
| TVSIMULATOR_CFLAGS = $(TVSIMULATOR_FLAGS) | |
| TVSIMULATOR_CXXFLAGS = $(TVSIMULATOR_FLAGS) | |
| +TVSIMULATOR_LDFLAGS = $(COMMON_LDFLAGS) | |
| TVSIMULATOR_CONFIGURE_FLAGS = \ | |
| --host=x86_64-apple-darwin10 \ | |
| --disable-boehm \ | |
| @@ -1094,10 +1133,13 @@ TVSIMULATOR_CONFIGURE_FLAGS = \ | |
| --disable-mcs-build \ | |
| --disable-nls \ | |
| --disable-iconv \ | |
| + --with-tls=pthread \ | |
| --disable-visibility-hidden \ | |
| $(XAMARIN_CONFIGURE_FLAGS) \ | |
| TVSIMULATOR_ACVARS = \ | |
| + mono_cv_uscore=yes \ | |
| + ac_cv_func_clock_nanosleep=no \ | |
| ac_cv_func_system=no \ | |
| ac_cv_func_pthread_kill=no \ | |
| ac_cv_func_kill=no \ | |
| @@ -1116,6 +1158,7 @@ TVSIMULATOR_ENVIRONMENT = \ | |
| CPPFLAGS="$(TVSIMULATOR_CPPFLAGS)" \ | |
| CFLAGS="$(TVSIMULATOR_CFLAGS)" \ | |
| CXXFLAGS="$(TVSIMULATOR_CXXFLAGS)" \ | |
| + LDFLAGS="$(TVSIMULATOR_LDFLAGS)" \ | |
| DEVELOPER_DIR=$(XCODE_DEVELOPER_ROOT) \ | |
| ifdef INCLUDE_TVOS | |
| @@ -1215,7 +1258,7 @@ $(eval $(2)_BASE_CPPFLAGS=-DSMALL_CONFIG -DDISABLE_POLICY_EVIDENCE=1 -DDISABLE_P | |
| $(eval $(2)_CPPFLAGS=$($(2)_BASE_CPPFLAGS) -arch $(1)) | |
| $(eval $(2)_CFLAGS=-O2 -gdwarf-2 $($(2)_BASE_CPPFLAGS) $(DEVICE_BUILD_CFLAGS) $(IOS_BITCODE_CFLAGS)) | |
| $(eval $(2)_CXXFLAGS=$($(2)_CPPFLAGS) $(IOS_BITCODE_CXXFLAGS)) | |
| -$(eval $(2)_LDFLAGS=-arch $(1) $(IOS_BITCODE_LDFLAGS)) | |
| +$(eval $(2)_LDFLAGS=-arch $(1) $(IOS_BITCODE_LDFLAGS) $(COMMON_LDFLAGS)) | |
| $(eval $(2)_CONFIGURE_FLAGS=--build=i386-apple-darwin10 \ | |
| $(4) \ | |
| --enable-maintainer-mode \ | |
| @@ -1441,7 +1484,7 @@ WATCHOS_FLAGS = \ | |
| WATCHOS_CPPFLAGS = $(WATCHOS_FLAGS) | |
| WATCHOS_CFLAGS = $(WATCHOS_FLAGS) | |
| WATCHOS_CXXFLAGS = $(WATCHOS_FLAGS) | |
| -WATCHOS_LDFLAGS = -arch armv7k -Wl,-bitcode_bundle -framework CoreFoundation -lobjc $(BITCODE_LDFLAGS) | |
| +WATCHOS_LDFLAGS = -arch armv7k -Wl,-bitcode_bundle -framework CoreFoundation -lobjc $(BITCODE_LDFLAGS) $(COMMON_LDFLAGS) | |
| WATCHOS_CONFIGURE_FLAGS = \ | |
| --build=i386-apple-darwin10 \ | |
| --host=armv7k-apple-darwin10 \ | |
| @@ -1607,7 +1650,7 @@ TVOS_FLAGS = \ | |
| TVOS_CPPFLAGS = $(TVOS_FLAGS) | |
| TVOS_CFLAGS = $(TVOS_FLAGS) $(DEVICE_BUILD_CFLAGS) | |
| TVOS_CXXFLAGS = $(TVOS_FLAGS) | |
| -TVOS_LDFLAGS = -arch arm64 -Wl,-bitcode_bundle -framework CoreFoundation -lobjc $(BITCODE_LDFLAGS) | |
| +TVOS_LDFLAGS = -arch arm64 -Wl,-bitcode_bundle -framework CoreFoundation -lobjc $(BITCODE_LDFLAGS) $(COMMON_LDFLAGS) | |
| TVOS_CONFIGURE_FLAGS = \ | |
| --build=x86_64-apple-darwin10 \ | |
| --host=aarch64-apple-darwin10 \ | |
| @@ -1876,7 +1919,7 @@ CROSS_BASE_CONFIGURE_FLAGS= \ | |
| # mono's configure already adds an -arch i386 flag, and cache doesn't like duplicate -arch flags | |
| CROSS_CFLAGS=$(CROSS_BASE_CFLAGS) -mmacosx-version-min=$(MIN_OSX_SDK_VERSION) | |
| CROSS_CXXFLAGS=$(CROSS_BASE_CXXFLAGS) -mmacosx-version-min=$(MIN_OSX_SDK_VERSION) -stdlib=libc++ | |
| -CROSS_LDFLAGS=-stdlib=libc++ | |
| +CROSS_LDFLAGS=-stdlib=libc++ $(COMMON_LDFLAGS) | |
| CROSS_CONFIGURE_FLAGS=$(CROSS_BASE_CONFIGURE_FLAGS) \ | |
| --prefix=$(BUILD_DESTDIR)/cross \ | |
| @@ -1889,7 +1932,7 @@ CROSS_CONFIGURE_FLAGS=$(CROSS_BASE_CONFIGURE_FLAGS) \ | |
| CROSS_CONFIGURE_ENVIRONMENT = \ | |
| CFLAGS="$(CROSS_CFLAGS)" \ | |
| CXXFLAGS="$(CROSS_CXXFLAGS)" \ | |
| - LDFLAGS=$(CROSS_LDFLAGS) \ | |
| + LDFLAGS="$(CROSS_LDFLAGS)" \ | |
| CC="$(MAC_CC)" \ | |
| CXX="$(MAC_CXX)" \ | |
| @@ -1938,7 +1981,7 @@ clean-cross: | |
| CROSS64_CFLAGS=$(CROSS_BASE_CFLAGS) -mmacosx-version-min=10.8 | |
| CROSS64_CXXFLAGS=$(CROSS_BASE_CXXFLAGS) -mmacosx-version-min=10.8 -stdlib=libc++ | |
| -CROSS64_LDFLAGS=-stdlib=libc++ | |
| +CROSS64_LDFLAGS=-stdlib=libc++ $(COMMON_LDFLAGS) | |
| CROSS64_CONFIGURE_FLAGS=$(CROSS_BASE_CONFIGURE_FLAGS) \ | |
| --prefix=$(BUILD_DESTDIR)/cross64 \ | |
| @@ -2016,7 +2059,7 @@ WATCH_CROSS_CONFIGURE_FLAGS=$(CROSS_BASE_CONFIGURE_FLAGS) \ | |
| WATCH_CONFIGURE_ENVIRONMENT = \ | |
| CFLAGS="$(CROSS_CFLAGS)" \ | |
| CXXFLAGS="$(CROSS_CXXFLAGS)" \ | |
| - LDFLAGS=$(CROSS_LDFLAGS) \ | |
| + LDFLAGS="$(CROSS_LDFLAGS)" \ | |
| CC="$(MAC_CC)" \ | |
| CXX="$(MAC_CXX)" \ | |
| @@ -2068,7 +2111,7 @@ clean-cross-watch: | |
| TV_CROSS_CFLAGS=$(CROSS_BASE_CFLAGS) -mmacosx-version-min=10.8 | |
| TV_CROSS_CXXFLAGS=$(CROSS_BASE_CXXFLAGS) -mmacosx-version-min=10.8 -stdlib=libc++ | |
| -TV_CROSS_LDFLAGS=-stdlib=libc++ | |
| +TV_CROSS_LDFLAGS=-stdlib=libc++ $(COMMON_LDFLAGS) | |
| TV_CROSS_CONFIGURE_FLAGS=$(CROSS_BASE_CONFIGURE_FLAGS) \ | |
| --prefix=$(BUILD_DESTDIR)/crosstv \ | |
| @@ -2079,7 +2122,7 @@ TV_CROSS_CONFIGURE_FLAGS=$(CROSS_BASE_CONFIGURE_FLAGS) \ | |
| TV_CROSS_CONFIGURE_ENVIRONMENT = \ | |
| $(Q) CFLAGS="$(TV_CROSS_CFLAGS)" \ | |
| CXXFLAGS="$(TV_CROSS_CXXFLAGS)" \ | |
| - LDFLAGS=$(TV_CROSS_LDFLAGS) \ | |
| + LDFLAGS="$(TV_CROSS_LDFLAGS)" \ | |
| CC="$(MAC_CC)" \ | |
| CXX="$(MAC_CXX)" \ | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment