diff options
author | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-05-02 18:31:21 (EDT) |
---|---|---|
committer | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-05-02 18:31:21 (EDT) |
commit | dd6c79189f2a4461629351dcc488eb71e05283d9 (patch) | |
tree | a0fabce52b15fc4b795f7cb6dfc7fdde319ff0c2 /build | |
parent | a3b75aae6ecb4436adf63bb57f2144fb83a86aa9 (diff) |
build: Remove more "4.7" strings
Diffstat (limited to 'build')
-rwxr-xr-x | build | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -123,7 +123,7 @@ $(buildnative_targets): oh-autobuild -B "$(builddir)" -T bootstrap-lean -- -j $${JOBS:-1} \ libsubdir="$${libsubdir}" \ libexecsubdir="$${libsubdir}" \ - gcc_gxx_tool_include_dir="/usr/include/$(target)/c++-4.7" \ + gcc_gxx_tool_include_dir="/usr/include/$(target)/c++-$(base_version)" \ libsubincludedir="$${libsubdir}/include" \ fincludedir="$${libsubdir}/finclude" \ toolexeclibdir="/usr/lib/$(target)" \ @@ -137,7 +137,7 @@ $(buildcross_targets): oh-autobuild -B "$(builddir)" -T all-gcc -- -j $${JOBS:-1} \ libsubdir="$${libsubdir}" \ libexecsubdir="$${libsubdir}" \ - gcc_gxx_tool_include_dir="/usr/include/$(target)/c++-4.7" \ + gcc_gxx_tool_include_dir="/usr/include/$(target)/c++-$(base_version)" \ libsubincludedir="$${libsubdir}/include" \ fincludedir="$${libsubdir}/finclude" \ toolexeclibdir="/usr/lib/$(target)" \ @@ -164,7 +164,7 @@ $(installnative_targets): # See also: <http://gcc.gnu.org/ml/gcc/2013-04/msg00171.html>. libsubdir="/usr/lib/$(target)/gcc-$(base_version)" && \ oh-autoinstall -B "$(builddir)" -d "$(destdir)" -T install -- \ - host_installdir=/usr/include/$(target)/c++-4.7/bits \ + host_installdir=/usr/include/$(target)/c++-$(base_version)/bits \ libsubdir="$${libsubdir}" \ libexecsubdir="$${libsubdir}" \ libsubincludedir="$${libsubdir}/include" \ @@ -295,8 +295,8 @@ $(installnative_targets): $(installcross_targets): libsubdir="/usr/lib/$(target)/gcc-$(base_version)" && \ oh-autoinstall -B "$(builddir)" -d "$(destdir)" -T install-gcc -- \ - gxx_include_dir=/usr/include/c++-4.7 \ - host_installdir=/usr/include/$(target)/c++-4.7/bits \ + gxx_include_dir=/usr/include/c++-$(base_version) \ + host_installdir=/usr/include/$(target)/c++-$(base_version)/bits \ libsubdir="$${libsubdir}" \ libexecsubdir="$${libsubdir}" \ libsubincludedir="$${libsubdir}/include" \ |