diff options
| author | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-05-19 20:14:07 (EDT) |
|---|---|---|
| committer | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-05-19 20:14:07 (EDT) |
| commit | 1ada34cc0474d7200fd731c3575854b3d9509e6c (patch) | |
| tree | 227d6bf9ec7e7b0202cbb425a0f53529059bd755 | |
| parent | 1ca97c0ac9f2c3887baf198ecaee195e6eb73f98 (diff) | |
build: rmdir default header directories
Really fixes:
# C++ headers:
mkdir -p \
dest-amd64-linux-glibc/usr/include/amd64-linux-glibc/gcc/$(printf '%s\n' 'gcc-8' | sed 's/^gcc-//') \
dest-amd64-linux-glibc/usr/include/amd64-linux-glibc/gcc/$(printf '%s\n' 'gcc-8' | sed 's/^gcc-//')/fixed \
dest-amd64-linux-glibc/usr/include/c++/$(printf '%s\n' 'gcc-8' | sed 's/^gcc-//') \
dest-amd64-linux-glibc/usr/include/amd64-linux-glibc/c++/$(printf '%s\n' 'gcc-8' | sed 's/^gcc-//') \
dest-amd64-linux-glibc/usr/include/c++/$(printf '%s\n' 'gcc-8' | sed 's/^gcc-//')/backward
mv dest-amd64-linux-glibc/usr/lib/amd64-linux-glibc/gcc/$(oh-architecture amd64-linux-glibc)/$(printf '%s\n' '8.3.0+sip1' | sed 's/+sip.*//')/include/* \
dest-amd64-linux-glibc/usr/include/amd64-linux-glibc/gcc/$(printf '%s\n' 'gcc-8' | sed 's/^gcc-//')
mv dest-amd64-linux-glibc/usr/lib/amd64-linux-glibc/gcc/$(oh-architecture amd64-linux-glibc)/$(printf '%s\n' '8.3.0+sip1' | sed 's/+sip.*//')/include-fixed/* \
dest-amd64-linux-glibc/usr/include/amd64-linux-glibc/gcc/$(printf '%s\n' 'gcc-8' | sed 's/^gcc-//')/fixed
# def_gcc_gxx_tool_include_dir and def_gcc_gxx_backward_include_dir are
# subdirectories of def_gcc_gxx_include_dir, so move them first.
mv dest-amd64-linux-glibc/usr/include/c++/$(printf '%s\n' '8.3.0+sip1' | sed 's/+sip.*//')/$(oh-architecture amd64-linux-glibc)/* \
dest-amd64-linux-glibc/usr/include/amd64-linux-glibc/c++/$(printf '%s\n' 'gcc-8' | sed 's/^gcc-//')
mv dest-amd64-linux-glibc/usr/include/c++/$(printf '%s\n' '8.3.0+sip1' | sed 's/+sip.*//')/backward/* \
dest-amd64-linux-glibc/usr/include/c++/$(printf '%s\n' 'gcc-8' | sed 's/^gcc-//')/backward
mv dest-amd64-linux-glibc/usr/include/c++/$(printf '%s\n' '8.3.0+sip1' | sed 's/+sip.*//')/* \
dest-amd64-linux-glibc/usr/include/c++/$(printf '%s\n' 'gcc-8' | sed 's/^gcc-//')
mv: can't rename 'dest-amd64-linux-glibc/usr/include/c++/8.3.0/backward': Directory not empty
../build:150: recipe for target 'install-native' failed
make[1]: *** [install-native] Error 1
make[1]: Leaving directory '/prokit/sessions/445794320/wd/tmp'
../build:308: recipe for target 'install' failed
make: *** [install] Error 2
| -rwxr-xr-x | build | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -190,16 +190,21 @@ install-native: $(destdir)$(gcc_gxx_backward_include_dir) mv $(destdir)$(def_gcc_gcc_include_dir)/* \ $(destdir)$(gcc_gcc_include_dir) + rmdir $(destdir)$(def_gcc_gcc_include_dir) mv $(destdir)$(def_gcc_fixed_include_dir)/* \ $(destdir)$(gcc_fixed_include_dir) + rmdir $(destdir)$(def_gcc_fixed_include_dir) # def_gcc_gxx_tool_include_dir and def_gcc_gxx_backward_include_dir are # subdirectories of def_gcc_gxx_include_dir, so move them first. mv $(destdir)$(def_gcc_gxx_tool_include_dir)/* \ $(destdir)$(gcc_gxx_tool_include_dir) + rmdir $(destdir)$(def_gcc_gxx_tool_include_dir) mv $(destdir)$(def_gcc_gxx_backward_include_dir)/* \ $(destdir)$(gcc_gxx_backward_include_dir) + rmdir $(destdir)$(def_gcc_gxx_backward_include_dir) mv $(destdir)$(def_gcc_gxx_include_dir)/* \ $(destdir)$(gcc_gxx_include_dir) + rmdir $(destdir)$(def_gcc_gxx_include_dir) # Target-arch libraries: mkdir -p $(destdir)$(libdir) mv $(destdir)$(libdir)/$(libsuffix)/* $(destdir)$(libdir) |