Skip to content

Commit

Permalink
[sdks] Package what's missing for XA (#11254)
Browse files Browse the repository at this point in the history
They require the additional files:
 - mono/eglib/eglib-config.h: that's to build `libmonodroid`
 - mcs/build/Consts.cs: that's to build `Mono.Posix` and `Mono.Data.Sqlite`
  • Loading branch information
monojenkins authored and luhenry committed Oct 19, 2018
1 parent 3986341 commit dc97716
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
7 changes: 5 additions & 2 deletions mcs/build/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,18 @@ thisdir = build
SUBDIRS =
include ../build/rules.make

BUILT_FILES = common/Consts.cs common/MonoNativeConfig.cs
BUILT_FILES = common/Consts.cs $(topdir)/class/lib/$(PROFILE_DIRECTORY)/Consts.cs common/MonoNativeConfig.cs

all-local install-local test-local run-test-local csproj-local run-test-ondotnet-local uninstall-local doc-update-local: $(BUILT_FILES)
@:

clean-local:
-rm -f $(BUILT_FILES) deps/*

common/Consts.cs: common/Consts.cs.in $(wildcard config.make)
$(topdir)/class/lib/$(PROFILE_DIRECTORY):
mkdir -p $@

common/Consts.cs $(topdir)/class/lib/$(PROFILE_DIRECTORY)/Consts.cs: common/Consts.cs.in $(wildcard config.make) | $(topdir)/class/lib/$(PROFILE_DIRECTORY)
test -n '$(MONO_VERSION)'
test -n '$(MONO_CORLIB_VERSION)'
sed -e 's,@''MONO_VERSION@,$(MONO_VERSION),' -e 's,@''MONO_CORLIB_VERSION@,$(MONO_CORLIB_VERSION),' $< > $@
Expand Down
4 changes: 4 additions & 0 deletions mono/eglib/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ libeglib_la_SOURCES = \
$(os_files)

CFLAGS := $(filter-out @CXX_REMOVE_CFLAGS@, @CFLAGS@) @CXX_ADD_CFLAGS@

eglibdir=$(datadir)/mono-$(API_VER)/mono/eglib
eglib_DATA = eglib-config.h

libeglib_la_CFLAGS = -g -Wall -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE

AM_CPPFLAGS = -I$(srcdir)
Expand Down

0 comments on commit dc97716

Please sign in to comment.