diff options
| author | Johann <johannkoenig@google.com> | 2012-02-17 10:53:19 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-02-17 10:53:19 -0800 |
| commit | e6047a17a9058b191ee618cd498fe71eaf2293ae (patch) | |
| tree | ac947d6dd7c79f4e43627470a4001182f3cfa2c9 | |
| parent | f93b1e7be1d4be4c034e138fcd59b1d59e3cb036 (diff) | |
| parent | 5f0b303c286781013ef03ebafb8ee27936f5c2e2 (diff) | |
| download | libvpx-e6047a17a9058b191ee618cd498fe71eaf2293ae.tar libvpx-e6047a17a9058b191ee618cd498fe71eaf2293ae.tar.gz libvpx-e6047a17a9058b191ee618cd498fe71eaf2293ae.tar.bz2 libvpx-e6047a17a9058b191ee618cd498fe71eaf2293ae.zip | |
Merge "OS X shell is incompatible with echo -n"
| -rwxr-xr-x | build/make/rtcd.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/build/make/rtcd.sh b/build/make/rtcd.sh index a5f1e6d73..1dffde58a 100755 --- a/build/make/rtcd.sh +++ b/build/make/rtcd.sh @@ -196,8 +196,8 @@ filter() { # Helper functions for generating the arch specific RTCD files # common_top() { - local outfile_basename=$(basename ${outfile:-rtcd.h}) - local include_guard=$(echo -n $outfile_basename | tr '[a-z]' '[A-Z]' | tr -c '[A-Z]' _) + local outfile_basename=$(basename ${symbol:-rtcd.h}) + local include_guard=$(echo $outfile_basename | tr '[a-z]' '[A-Z]' | tr -c '[A-Z]' _) cat <<EOF #ifndef ${include_guard} #define ${include_guard} @@ -225,7 +225,7 @@ x86() { # Assign the helper variable for each enabled extension for opt in $ALL_ARCHS; do - local uc=$(echo -n $opt | tr '[a-z]' '[A-Z]') + local uc=$(echo $opt | tr '[a-z]' '[A-Z]') eval "have_${opt}=\"flags & HAS_${uc}\"" done @@ -253,7 +253,7 @@ arm() { # Assign the helper variable for each enabled extension for opt in $ALL_ARCHS; do - local uc=$(echo -n $opt | tr '[a-z]' '[A-Z]') + local uc=$(echo $opt | tr '[a-z]' '[A-Z]') eval "have_${opt}=\"flags & HAS_${uc}\"" done |