From 05f52ca1a68e13e9b69da45811f387889e4e4398 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 6 Sep 2016 16:06:33 +0200
Subject: Remove explicit config.bin.lib=shared from bootstrap, we don't really
 need

---
 BOOTSTRAP-MINGW.cli | 3 ---
 BOOTSTRAP-MSVC.cli  | 3 ---
 BOOTSTRAP-UNIX.cli  | 3 ---
 UPGRADE.cli         | 3 ---
 build-mingw.bat     | 2 --
 build-msvc.bat      | 2 --
 build.sh            | 2 --
 7 files changed, 18 deletions(-)

diff --git a/BOOTSTRAP-MINGW.cli b/BOOTSTRAP-MINGW.cli
index 440ef68..6b540fd 100644
--- a/BOOTSTRAP-MINGW.cli
+++ b/BOOTSTRAP-MINGW.cli
@@ -95,7 +95,6 @@ On this step the entire toolchain is built and staged:
 
 > build2\build2\b-boot configure      ^
   config.cxx=g++                      ^
-  config.bin.lib=shared               ^
   config.bin.suffix=-stage            ^
   config.install.root=C:\build2       ^
   config.install.data_root=root\stage
@@ -133,7 +132,6 @@ change the \c{configure} command line above along these lines:
 > build2\build2\b-boot configure ^
   config.cxx=g++                 ^
   config.cc.coptions=-O3         ^
-  config.bin.lib=shared          ^
   config.install.root=C:\build2
 \
 
@@ -155,7 +153,6 @@ to the previous step and you may want/need to make similar adjustments.
   cc                            ^
   config.cxx=g++                ^
   config.cc.coptions=-O3        ^
-  config.bin.lib=shared         ^
   config.install.root=C:\build2
 \
 
diff --git a/BOOTSTRAP-MSVC.cli b/BOOTSTRAP-MSVC.cli
index 0ade62d..5d30836 100644
--- a/BOOTSTRAP-MSVC.cli
+++ b/BOOTSTRAP-MSVC.cli
@@ -84,7 +84,6 @@ On this step the entire toolchain is built and staged:
 
 > build2\build2\b-boot configure      ^
   config.cxx=cl                       ^
-  config.bin.lib=shared               ^
   config.bin.suffix=-stage            ^
   config.install.root=C:\build2       ^
   config.install.data_root=root\stage
@@ -122,7 +121,6 @@ change the \c{configure} command line above along these lines:
 > build2\build2\b-boot configure ^
   config.cxx=cl                  ^
   \"config.cc.coptions=/O2 /Oi\"   ^
-  config.bin.lib=shared          ^
   config.install.root=C:\build2
 \
 
@@ -144,7 +142,6 @@ to the previous step and you may want/need to make similar adjustments.
   cc                            ^
   config.cxx=cl                 ^
   \"config.cc.coptions=/O2 /Oi\"  ^
-  config.bin.lib=shared         ^
   config.install.root=C:\build2
 \
 
diff --git a/BOOTSTRAP-UNIX.cli b/BOOTSTRAP-UNIX.cli
index a31c513..e3a8730 100644
--- a/BOOTSTRAP-UNIX.cli
+++ b/BOOTSTRAP-UNIX.cli
@@ -147,7 +147,6 @@ $ run cd ..  # Back to build2-toolchain-X.Y.Z/
 
 $ build2/build2/b-boot configure      \
   config.cxx=g++                      \
-  config.bin.lib=shared               \
   config.bin.suffix=-stage            \
   config.bin.rpath=/usr/local/lib     \
   config.install.root=/usr/local      \
@@ -202,7 +201,6 @@ change the \c{configure} command line above along these lines:
 $ build2/build2/b-boot configure  \
   config.cxx=g++                  \
   config.cc.coptions=-O3          \
-  config.bin.lib=shared           \
   config.bin.rpath=/usr/local/lib \
   config.install.root=/usr/local  \
   config.install.sudo=sudo
@@ -227,7 +225,6 @@ $ bpkg-stage create               \
   cc                              \
   config.cxx=g++                  \
   config.cc.coptions=-O3          \
-  config.bin.lib=shared           \
   config.bin.rpath=/usr/local/lib \
   config.install.root=/usr/local  \
   config.install.sudo=sudo
diff --git a/UPGRADE.cli b/UPGRADE.cli
index bae07a9..15e37e1 100644
--- a/UPGRADE.cli
+++ b/UPGRADE.cli
@@ -165,7 +165,6 @@ $ bpkg-stage create             \
 cc                              \
 config.cxx=g++                  \
 config.cc.coptions=-O3          \
-config.bin.lib=shared           \
 config.bin.rpath=/usr/local/lib \
 config.install.root=/usr/local  \
 config.install.sudo=sudo
@@ -178,7 +177,6 @@ For Windows with MSVC (from the Visual Studio command prompt):
   cc                             ^
   config.cxx=cl                  ^
   \"config.cc.coptions=/O2 /Oi\"   ^
-  config.bin.lib=shared          ^
   config.install.root=C:\build2
 \
 
@@ -189,7 +187,6 @@ For Windows with MinGW (from the command prompt):
   cc                            ^
   config.cxx=g++                ^
   config.cc.coptions=-O3        ^
-  config.bin.lib=shared         ^
   config.install.root=C:\build2
 \
 "
diff --git a/build-mingw.bat b/build-mingw.bat
index 2ea001d..6400179 100644
--- a/build-mingw.bat
+++ b/build-mingw.bat
@@ -111,7 +111,6 @@ cd ..
 
 build2\build2\b-boot configure^
  config.cxx=%cxx%^
- config.bin.lib=shared^
  config.bin.suffix=-stage^
  config.install.root=%idir%^
  config.install.data_root=root\stage
@@ -145,7 +144,6 @@ bpkg-stage create^
  cc^
  config.cxx=%cxx%^
  config.cc.coptions=-O3^
- config.bin.lib=shared^
  config.install.root=%idir%
 @if errorlevel 1 goto error
 
diff --git a/build-msvc.bat b/build-msvc.bat
index 96bb79f..d9760ba 100644
--- a/build-msvc.bat
+++ b/build-msvc.bat
@@ -103,7 +103,6 @@ cd ..
 
 build2\build2\b-boot configure^
  config.cxx=cl^
- config.bin.lib=shared^
  config.bin.suffix=-stage^
  config.install.root=%idir%^
  config.install.data_root=root\stage
@@ -137,7 +136,6 @@ bpkg-stage create^
  cc^
  config.cxx=cl^
  "config.cc.coptions=/O2 /Oi"^
- config.bin.lib=shared^
  config.install.root=%idir%
 @if errorlevel 1 goto error
 
diff --git a/build.sh b/build.sh
index 5bcb967..dfbd301 100755
--- a/build.sh
+++ b/build.sh
@@ -180,7 +180,6 @@ run cd ..
 
 run build2/build2/b-boot configure \
 config.cxx="$cxx" \
-config.bin.lib=shared \
 config.bin.suffix=-stage \
 config.bin.rpath="$conf_rpath" \
 config.install.root="$idir" \
@@ -205,7 +204,6 @@ run bpkg-stage create \
 cc \
 config.cxx="$cxx" \
 config.cc.coptions=-O3 \
-config.bin.lib=shared \
 config.bin.rpath="$conf_rpath" \
 config.install.root="$idir" \
 config.install.sudo="$conf_sudo"
-- 
cgit v1.1