diff options
| author | Rolf Bjarne Kvinge <rolf@xamarin.com> | 2014-04-25 18:57:01 +0400 |
|---|---|---|
| committer | Rolf Bjarne Kvinge <rolf@xamarin.com> | 2014-04-25 18:57:01 +0400 |
| commit | 19f49f93f9ec66cfd54b458796c3b0800d6fb9c3 (patch) | |
| tree | f275d6501ba08a02d81df5413cbc321a3c6ae0ad /eglib | |
| parent | f37e86ff58d7b5a47484e60aded45bf8b98ae918 (diff) | |
Revert "Revert "Merge branch 'master' of https://github.com/mono/mono""
This reverts commit 8f09dad4353bb75afebf96ad58d08f7e7f3bf56d.
8f09dad4353bb75afebf96ad58d08f7e7f3bf56d is reverting a merge commit,
which will not do what you think it does. It will revert much more,
so revert the revert to get back the unintentionally reverted commits.
It looks like the next commit (1a15d4ec541eaf20ed78eac53149b1b83e1450fe)
is doing the original intention (reverting 164f9cbec4f79cc013c7b1cf674e70e4573f4b36),
so this revert will leave the tree in a good state, with no pending
reverts.
Diffstat (limited to 'eglib')
| -rw-r--r-- | eglib/configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/eglib/configure.ac b/eglib/configure.ac index fdbce134b97..f8853385a8d 100644 --- a/eglib/configure.ac +++ b/eglib/configure.ac @@ -88,7 +88,7 @@ case $host in esac case $target in -arm*-darwin*) +arm*-darwin*|aarch64*-*) CFLAGS="$CFLAGS -U_FORTIFY_SOURCE" ;; i*86-*-darwin*) |