| Index: ports/binutils/build.sh
|
| diff --git a/ports/binutils/build.sh b/ports/binutils/build.sh
|
| index ead3531f48e841fffb508b54d4b9e3aa91352d82..edfd936fa9a0174da8c9d9cda832148598aa1434 100644
|
| --- a/ports/binutils/build.sh
|
| +++ b/ports/binutils/build.sh
|
| @@ -17,16 +17,12 @@ BuildStep() {
|
| }
|
|
|
| InstallStep() {
|
| - MakeDir ${PUBLISH_DIR}
|
| - for nexe in binutils/*.nexe gas/*.nexe ld/*.nexe; do
|
| - local name=$(basename $nexe .nexe | sed 's/-new//')
|
| - cp ${nexe} ${PUBLISH_DIR}/${name}_${NACL_ARCH}${NACL_EXEEXT}
|
| -
|
| - pushd ${PUBLISH_DIR}
|
| - LogExecute python ${NACL_SDK_ROOT}/tools/create_nmf.py \
|
| - ${PUBLISH_DIR}/${name}_*${NACL_EXEEXT} \
|
| - -s . \
|
| - -o ${name}.nmf
|
| - popd
|
| - done
|
| + DefaultInstallStep
|
| + # The ldscripts that ship with this verion of binutils doesn't seem to
|
| + # work with the glibc toolchain devenv. Instead we copy the linker scripts
|
| + # out of the SDK root.
|
| + rm -rf ${DESTDIR}${PREFIX}/*-nacl/lib/ldscripts
|
| + LogExecute cp -r \
|
| + ${NACL_SDK_ROOT}/toolchain/${OS_SUBDIR}_x86_glibc/x86_64-nacl/lib/ldscripts \
|
| + ${DESTDIR}${PREFIX}/x86_64-nacl/lib/
|
| }
|
|
|