diff options
author | Timothy B. Terriberry <tterribe@xiph.org> | 2014-03-26 23:58:04 +0400 |
---|---|---|
committer | Timothy B. Terriberry <tterribe@xiph.org> | 2014-03-26 23:58:04 +0400 |
commit | 4ae4bc61d033bd615bb6ddfe18f28994d02c51bc (patch) | |
tree | 6ecf155ec162e5bec9f2260cbde306ff30ae7d3d | |
parent | 76e831d917fffc55854ba2dc68b61f51c8ba61b7 (diff) |
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.
-rw-r--r-- | Makefile.am | 2 | ||||
-rwxr-xr-x | celt/arm/arm2gnu.pl | 6 |
2 files changed, 4 insertions, 4 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@ < $< > $@ diff --git a/celt/arm/arm2gnu.pl b/celt/arm/arm2gnu.pl index 54f7129b..6c922ac8 100755 --- a/celt/arm/arm2gnu.pl +++ b/celt/arm/arm2gnu.pl @@ -36,12 +36,12 @@ eval 'exec /usr/local/bin/perl -S $0 ${1+"$@"}' while ($ARGV[0] =~ /^-/) { $_ = shift; - last if /^--/; - if (/^-n/) { + last if /^--$/; + if (/^-n$/) { $nflag++; next; } - if (/^--apple/) { + if (/^--apple$/) { $apple = 1; $symprefix = "_"; next; |