aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2019-10-14 16:19:49 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2019-10-14 16:19:49 +0300
commit00678a92ae8454198b696ce1b623ec40de232457 (patch)
treebe20b8a712b55da1d5a5df8941ba09cdb1dc87c1
parent1ee55930c06cc1e39da63c0096fce7e9facee103 (diff)
Add config.bin.lib=shared to configurations created by build scripts
-rw-r--r--BOOTSTRAP-UNIX.cli3
-rw-r--r--BOOTSTRAP-WINDOWS-MINGW.cli3
-rw-r--r--BOOTSTRAP-WINDOWS-MSVC.cli3
-rw-r--r--build-clang.bat2
-rw-r--r--build-mingw.bat2
-rw-r--r--build-msvc.bat2
-rwxr-xr-xbuild.sh2
7 files changed, 17 insertions, 0 deletions
diff --git a/BOOTSTRAP-UNIX.cli b/BOOTSTRAP-UNIX.cli
index 0546a9d..cc10512 100644
--- a/BOOTSTRAP-UNIX.cli
+++ b/BOOTSTRAP-UNIX.cli
@@ -168,6 +168,7 @@ $ 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 \
@@ -222,6 +223,7 @@ the \c{configure} and \c{install} command lines 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
@@ -248,6 +250,7 @@ $ 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/BOOTSTRAP-WINDOWS-MINGW.cli b/BOOTSTRAP-WINDOWS-MINGW.cli
index 163d3a7..18835d3 100644
--- a/BOOTSTRAP-WINDOWS-MINGW.cli
+++ b/BOOTSTRAP-WINDOWS-MINGW.cli
@@ -119,6 +119,7 @@ libraries and then 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
@@ -156,6 +157,7 @@ the \c{configure} and \c{install} command lines 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
> build2\build2\b-boot install: build2/ bpkg/ bdep/
@@ -179,6 +181,7 @@ 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-WINDOWS-MSVC.cli b/BOOTSTRAP-WINDOWS-MSVC.cli
index 59c08d1..4283340 100644
--- a/BOOTSTRAP-WINDOWS-MSVC.cli
+++ b/BOOTSTRAP-WINDOWS-MSVC.cli
@@ -90,6 +90,7 @@ libraries and then 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
@@ -127,6 +128,7 @@ the \c{configure} and \c{install} command lines above along these lines:
> build2\build2\b-boot configure ^
config.cxx=cl ^
config.cc.coptions=/O2 ^
+ config.bin.lib=shared ^
config.install.root=C:\build2
> build2\build2\b-boot install: build2/ bpkg/ bdep/
@@ -150,6 +152,7 @@ previous step and you may want/need to make similar adjustments.
cc ^
config.cxx=cl ^
config.cc.coptions=/O2 ^
+ config.bin.lib=shared ^
config.install.root=C:\build2
\
diff --git a/build-clang.bat b/build-clang.bat
index 460bddf..e6c4c93 100644
--- a/build-clang.bat
+++ b/build-clang.bat
@@ -239,6 +239,7 @@ cd ..
build2\build2\b-boot %verbose% configure^
config.cxx=%cxx%^
config.cc.coptions=-m64^
+ config.bin.lib=shared^
config.bin.suffix=-stage^
config.install.root=%idir%^
config.install.data_root=root\stage
@@ -276,6 +277,7 @@ bpkg-stage %verbose% create^
cc^
config.cxx=%cxx%^
"config.cc.coptions=-m64 -O3"^
+ config.bin.lib=shared^
config.install.root=%idir%
@if errorlevel 1 goto error
diff --git a/build-mingw.bat b/build-mingw.bat
index 53ba6a3..85f8cbe 100644
--- a/build-mingw.bat
+++ b/build-mingw.bat
@@ -247,6 +247,7 @@ cd ..
build2\build2\b-boot %verbose% configure^
config.cxx=%cxx%^
+ config.bin.lib=shared^
config.bin.suffix=-stage^
config.install.root=%idir%^
config.install.data_root=root\stage
@@ -286,6 +287,7 @@ bpkg-stage %verbose% 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 85e8244..12d48e0 100644
--- a/build-msvc.bat
+++ b/build-msvc.bat
@@ -212,6 +212,7 @@ cd ..
build2\build2\b-boot %verbose% configure^
config.cxx=%cxx%^
+ config.bin.lib=shared^
config.bin.suffix=-stage^
config.install.root=%idir%^
config.install.data_root=root\stage
@@ -249,6 +250,7 @@ bpkg-stage %verbose% create^
cc^
config.cxx=%cxx%^
config.cc.coptions=/O2^
+ config.bin.lib=shared^
config.install.root=%idir%
@if errorlevel 1 goto error
diff --git a/build.sh b/build.sh
index 7c977cd..1995932 100755
--- a/build.sh
+++ b/build.sh
@@ -306,6 +306,7 @@ run cd ..
run build2/build2/b-boot $verbose configure \
config.cxx="$cxx" \
+config.bin.lib=shared \
config.bin.suffix=-stage \
config.bin.rpath="$conf_rpath" \
config.install.root="$idir" \
@@ -331,6 +332,7 @@ run bpkg-stage $verbose create \
cc \
config.cxx="$cxx" \
config.cc.coptions="$*" \
+config.bin.lib=shared \
config.bin.rpath="$conf_rpath" \
config.install.root="$idir" \
config.install.sudo="$conf_sudo"