diff options
| author | Ludovic Henry <luhenry@microsoft.com> | 2018-10-02 00:43:46 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-02 00:43:46 +0300 |
| commit | 0aebe90cac85a171735629a779f44ca04bc90377 (patch) | |
| tree | 14cb84a7d88a4d58762624fce3122a64d800fdc5 /sdks/builds/runtime.mk | |
| parent | 9182bcccc3ded3ea3b00e10771ea81b0ed3fcc8f (diff) | |
[sdks] Create archive targets for pre-building on CI (#10882)
* [sdks] Remove redundant --enable-cxx
* [sdks] Shorten `-m32`/`-m64` parameters detection for runtimes
* [sdks] Build BCL profiles without configure flags
* [sdks] Add BclTemplate to build BCL profiles
This is to avoid building all the profiles in a single `sdks/out/bcl` directory which will be shared between android, ios and wasm.
* [sdks] Create archive targets for pre-building on CI
* [sdks] Use archive-{android,ios,wasm} on CI
* [sdks] Run archive-llvm-llvm{,win}{32,64} on CI
Diffstat (limited to 'sdks/builds/runtime.mk')
| -rw-r--r-- | sdks/builds/runtime.mk | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/sdks/builds/runtime.mk b/sdks/builds/runtime.mk index 5bb41f76eda..f4758d386d6 100644 --- a/sdks/builds/runtime.mk +++ b/sdks/builds/runtime.mk @@ -25,15 +25,7 @@ # _$(1)_PATH define RuntimeTemplate -_runtime_$(1)_BITNESS=$$(if $$(findstring i686,$(2)),-m32) - -ifeq ($$(_runtime_$(1)_BITNESS),) -_runtime_$(1)_BITNESS=$$(if $$(findstring i386,$(2)),-m32) -endif - -ifeq ($$(_runtime_$(1)_BITNESS),) -_runtime_$(1)_BITNESS=$$(if $$(findstring x86_64,$(2)),-m64) -endif +_runtime_$(1)_BITNESS=$$(if $$(or $$(findstring i686,$(2)),$$(findstring i386,$(2))),-m32,$$(if $$(findstring x86_64,$(2)),-m64)) _runtime_$(1)_CFLAGS=$(if $(RELEASE),-O2 -g,-O0 -ggdb3 -fno-omit-frame-pointer) $$(_$(1)_CFLAGS) $$($(1)_CFLAGS) $$(_runtime_$(1)_BITNESS) _runtime_$(1)_CXXFLAGS=$(if $(RELEASE),-O2 -g,-O0 -ggdb3 -fno-omit-frame-pointer) $$(_$(1)_CXXFLAGS) $$($(1)_CXXFLAGS) $$(_runtime_$(1)_BITNESS) @@ -64,10 +56,10 @@ _runtime_$(1)_CONFIGURE_ENVIRONMENT = \ $$($(1)_CONFIGURE_ENVIRONMENT) _runtime_$(1)_CONFIGURE_FLAGS= \ - $(if $(ENABLE_CXX),--enable-cxx) \ $$(if $(2),--host=$(2)) \ --cache-file=$$(TOP)/sdks/builds/$(1)-$$(CONFIGURATION).config.cache \ --prefix=$$(TOP)/sdks/out/$(1)-$$(CONFIGURATION) \ + $$(if $$(ENABLE_CXX),--enable-cxx) \ $$(_cross-runtime_$(1)_CONFIGURE_FLAGS) \ $$(_$(1)_CONFIGURE_FLAGS) \ $$($(1)_CONFIGURE_FLAGS) @@ -136,7 +128,6 @@ $(TOP)/tools/offsets-tool/MonoAotOffsetsDumper.exe: $(wildcard $(TOP)/tools/offs define CrossRuntimeTemplate _cross-runtime_$(1)_CONFIGURE_FLAGS= \ - $(if $(ENABLE_CXX),--enable-cxx) \ --target=$(3) \ --with-cross-offsets=$(3).h \ --with-llvm=$$(TOP)/sdks/out/$(5) |