diff options
| author | P. J. McDermott <pjm@nac.net> | 2012-07-28 08:34:54 (EDT) |
|---|---|---|
| committer | P. J. McDermott <pjm@nac.net> | 2012-07-28 08:34:54 (EDT) |
| commit | 475aa12a9026f85a031e03dd51fc96d7c1088037 (patch) | |
| tree | 3d3bab32987f7f9bb8d2ad41a8d44daacd2c0f0f /build | |
| parent | aa48949aa97c4d5bc0fc25b1a2d9b1d148101d89 (diff) | |
Fix creation and removal of directories.
Diffstat (limited to 'build')
| -rwxr-xr-x | build | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -63,11 +63,9 @@ install.stamp: build.stamp # This is a kludge to put libiberty.a in the right place. # The problem is that libiberty's makefile asks GCC for a multilib # directory. - for target in $(PKG_TARGETS); do \ - liberty="$$(find dest/usr/lib -name libiberty.a)" && \ + liberty="$$(find dest/usr/lib -name libiberty.a)" && \ mv "$${liberty}" dest/usr/lib/$(OH_HOST_ARCH) && \ - rmdir "$${liberty%/libiberty.a}"; \ - done + rmdir "$${liberty%/libiberty.a}" # Move BFD libraries and headers into multiarch locations. # This can't be done with *dir options; these paths are hardcoded in # bfd/configure. @@ -79,9 +77,9 @@ install.stamp: build.stamp "dest/usr/include/$(OH_HOST_ARCH)/$${target}" && \ mv "dest/usr/$(OH_HOST_ARCH_GNU)/$${target_arch_gnu}/lib" \ "dest/usr/lib/$(OH_HOST_ARCH)/$${target}" && \ - rmdir "dest/usr/$(OH_HOST_ARCH_GNU)/$${target_arch_gnu}" && \ - rmdir "dest/usr/$(OH_HOST_ARCH_GNU)"; \ + rmdir "dest/usr/$(OH_HOST_ARCH_GNU)/$${target_arch_gnu}"; \ done + rmdir "dest/usr/$(OH_HOST_ARCH_GNU)" \ # Remove static library dependency metadata generated by libtool. rm -f dest/usr/lib/$(OH_HOST_ARCH)/*/*.la # Make symbolic links to native utilities. @@ -93,6 +91,7 @@ install.stamp: build.stamp fi; \ done # Write GNU ld configuration to point to BFD libraries. + mkdir -p /etc/ld.so.conf.d for target in $(PKG_TARGETS); do \ echo '# GNU BFD libraries' >"dest/etc/ld.so.conf.d/bdf-$${target}" && \ echo "/usr/lib/$(OH_HOST_ARCH)/$${target}" \ |