diff options
| author | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-05-19 15:44:44 (EDT) |
|---|---|---|
| committer | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-05-19 15:44:44 (EDT) |
| commit | e50414975d437dea8120701ba8b870982bd9120f (patch) | |
| tree | d688b55c393cbf58351a2b3d8f6faaf275ededb5 | |
| parent | d634e7f2b42045b6b077aae16c24fb1e65c198fc (diff) | |
build: Rearrange C++ header mv commands
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
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 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: can't rename 'dest-amd64-linux-glibc/usr/include/c++/8.3.0/x86_64-unknown-linux-gnu/*': No such file or directory
../build:150: recipe for target 'install-native' failed
make[1]: *** [install-native] Error 1
make[1]: Leaving directory '/prokit/sessions/2969185405/wd/tmp'
../build:307: recipe for target 'install' failed
make: *** [install] Error 2
| -rwxr-xr-x | build | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -192,12 +192,14 @@ install-native: $(destdir)$(gcc_gcc_include_dir) mv $(destdir)$(def_gcc_fixed_include_dir)/* \ $(destdir)$(gcc_fixed_include_dir) - mv $(destdir)$(def_gcc_gxx_include_dir)/* \ - $(destdir)$(gcc_gxx_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) mv $(destdir)$(def_gcc_gxx_backward_include_dir)/* \ $(destdir)$(gcc_gxx_backward_include_dir) + mv $(destdir)$(def_gcc_gxx_include_dir)/* \ + $(destdir)$(gcc_gxx_include_dir) # Target-arch libraries: mkdir -p $(destdir)$(libdir) mv $(destdir)$(libdir)/$(libsuffix)/* $(destdir)$(libdir) |