diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2018-06-03 16:13:40 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2018-06-03 16:19:56 -0700 |
| commit | fdb20d05bc27d5deb792f7dd3162e5e423d0fa8a (patch) | |
| tree | 6f2681d7b25f2f98c7cedfd27d55c75499ce1e9a | |
| parent | 1d2318d6cd9b7f64178afb4e3a8ce481dd603bbf (diff) | |
| download | android_build_soong-fdb20d05bc27d5deb792f7dd3162e5e423d0fa8a.tar.gz android_build_soong-fdb20d05bc27d5deb792f7dd3162e5e423d0fa8a.tar.bz2 android_build_soong-fdb20d05bc27d5deb792f7dd3162e5e423d0fa8a.zip | |
Fix mac sdk build
Use the host platform "strip", and also expose "nm" and "otool" used for
toc.
Test: `m PRODUCT-sdk-sdk` on Mac
Change-Id: I7a6d127f479d3e563385ead46bc3a4b49b99776b
| -rw-r--r-- | cc/makevars.go | 5 | ||||
| -rwxr-xr-x | scripts/toc.sh | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/cc/makevars.go b/cc/makevars.go index 8177aa88..c95bad2c 100644 --- a/cc/makevars.go +++ b/cc/makevars.go @@ -312,14 +312,17 @@ func makeVarsToolchain(ctx android.MakeVarsContext, secondPrefix string, ctx.Strict(makePrefix+"CC", gccCmd(toolchain, "gcc")) ctx.Strict(makePrefix+"CXX", gccCmd(toolchain, "g++")) - ctx.Strict(makePrefix+"STRIP", gccCmd(toolchain, "strip")) if target.Os == android.Darwin { ctx.Strict(makePrefix+"AR", "${config.MacArPath}") + ctx.Strict(makePrefix+"NM", "${config.MacToolPath}/nm") + ctx.Strict(makePrefix+"OTOOL", "${config.MacToolPath}/otool") + ctx.Strict(makePrefix+"STRIP", "${config.MacStripPath}") } else { ctx.Strict(makePrefix+"AR", "${config.ClangBin}/llvm-ar") ctx.Strict(makePrefix+"READELF", gccCmd(toolchain, "readelf")) ctx.Strict(makePrefix+"NM", gccCmd(toolchain, "nm")) + ctx.Strict(makePrefix+"STRIP", gccCmd(toolchain, "strip")) } if target.Os == android.Windows { diff --git a/scripts/toc.sh b/scripts/toc.sh index 7b2224c0..bd6425be 100755 --- a/scripts/toc.sh +++ b/scripts/toc.sh @@ -39,8 +39,8 @@ do_elf() { } do_macho() { - otool -l "${infile}" | grep LC_ID_DYLIB -A 5 > "${outfile}.tmp" - nm -gP "${infile}" | cut -f1-2 -d" " | grep -v 'U$' >> "${outfile}.tmp" + "${CROSS_COMPILE}/otool" -l "${infile}" | grep LC_ID_DYLIB -A 5 > "${outfile}.tmp" + "${CROSS_COMPILE}/nm" -gP "${infile}" | cut -f1-2 -d" " | grep -v 'U$' >> "${outfile}.tmp" } |