diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2014-12-12 13:22:00 +0800 |
|---|---|---|
| committer | Andrew Hsieh <andrewhsieh@google.com> | 2014-12-12 13:22:00 +0800 |
| commit | 0c7bf1a9c8ca5d0f382d6e3bda5adb161278431b (patch) | |
| tree | 64038facbf5b8a90335d93b57e24f762317df0ef /build | |
| parent | 49df70f8591f41d6c29700181fe08bd307834384 (diff) | |
| download | ndk-0c7bf1a9c8ca5d0f382d6e3bda5adb161278431b.tar.gz | |
Fix build libcompiler-rt
1. corrected path of 2 files filtered out
2. Since now pattern contain two '/', fix filter_out to replace all '/'
with '\/', not just the first
Change-Id: I52d132074cce53ff1dc8289705ab56599e8118b5
Diffstat (limited to 'build')
| -rwxr-xr-x | build/tools/build-compiler-rt.sh | 2 | ||||
| -rw-r--r-- | build/tools/prebuilt-common.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/build/tools/build-compiler-rt.sh b/build/tools/build-compiler-rt.sh index 4a81d31b1..ade635bcd 100755 --- a/build/tools/build-compiler-rt.sh +++ b/build/tools/build-compiler-rt.sh @@ -103,7 +103,7 @@ COMPILER_RT_LDFLAGS="-nostdlib" COMPILER_RT_GENERIC_SOURCES=$(cd $SRC_DIR && ls lib/builtins/*.c) # filter out the sources we don't need -UNUSED_SOURCES="lib/apple_versioning.c lib/gcc_personality_v0.c" +UNUSED_SOURCES="lib/builtins/apple_versioning.c lib/builtins/gcc_personality_v0.c" COMPILER_RT_GENERIC_SOURCES=$(filter_out "$UNUSED_SOURCES" "$COMPILER_RT_GENERIC_SOURCES") # ARM specific diff --git a/build/tools/prebuilt-common.sh b/build/tools/prebuilt-common.sh index 210acefe7..a4024e37b 100644 --- a/build/tools/prebuilt-common.sh +++ b/build/tools/prebuilt-common.sh @@ -204,7 +204,7 @@ filter_out () local PATTERN="$1" local TEXT="$2" for pat in $PATTERN; do - pat=$"${pat/\//\\/}" + pat=$"${pat//\//\\/}" TEXT=$(echo $TEXT | sed -e 's/'$pat' //g' -e 's/'$pat'$//g') done echo $TEXT |