summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorTimothy B. Terriberry <tterribe@xiph.org>2014-03-26 12:58:04 -0700
committerTimothy B. Terriberry <tterribe@xiph.org>2014-03-26 12:58:04 -0700
commit4ae4bc61d033bd615bb6ddfe18f28994d02c51bc (patch)
tree6ecf155ec162e5bec9f2260cbde306ff30ae7d3d /Makefile.am
parent76e831d917fffc55854ba2dc68b61f51c8ba61b7 (diff)
downloadopus-4ae4bc61d033bd615bb6ddfe18f28994d02c51bc.tar.gz
Fix iOS builds with assembly.
The patch in 76e831d917ff got us most of the way there, but out-of-tree builds required a second Makefile.am rule, which was missing @ARM2GNU_PARAMS@. Also, the arm2gnu.pl was terminating argument processing on any argument beginning with --, rather than an argument that was just -- by itself (as is the normal convention in GNU programs). That meant it never saw the --apple flag even when it was passed. Thanks to Jonathan Lennox for the report and for testing.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index e76b2049..fac7651f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -228,4 +228,4 @@ $(CELT_SOURCES_ARM_ASM:%.s=%-gnu.S): $(top_srcdir)/celt/arm/arm2gnu.pl
$(top_srcdir)/celt/arm/arm2gnu.pl @ARM2GNU_PARAMS@ < $< > $@
# For autoconf-modified sources (e.g., armopts.s)
%-gnu.S: %.s
- $(top_srcdir)/celt/arm/arm2gnu.pl < $< > $@
+ $(top_srcdir)/celt/arm/arm2gnu.pl @ARM2GNU_PARAMS@ < $< > $@