reactos/RosBE
1
0
Fork 0
mirror of https://github.com/reactos/RosBE.git synced 2025-02-19 18:51:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[ROSBE-WINDOWS] Add back --enable-version-specific-runtime-libs and unify amd64 and x86 build scripts a bit.

Browse Source 
Needs backporting to RosBE-Unix when it's proven.
This commit is contained in:
Colin Finck 2020-05-29 18:42:39 +02:00
parent 47c35a0798
commit 8bb7462450
No known key found for this signature in database
GPG Key ID: 1BA74E70456BA1A9
2 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
RosBE-Windows/Buildtoolchain/buildtoolchain-mingw32-amd64.sh
View File

@ -49,6 +49,9 @@ rs_target="x86_64-w64-mingw32"
rs_target_cflags="-pipe -O2 -Wl,-S -g0"
rs_target_cxxflags="$rs_target_cflags"
# This is a cross-compiler with prefix.
rs_target_tool_prefix="${rs_target}-"
export CC="$rs_host_cc"
export CFLAGS="$rs_host_cflags"
export CXX="$rs_host_cxx"
@ -193,21 +196,21 @@ if rs_prepare_module "gcc"; then
export CFLAGS_FOR_TARGET="$rs_target_cflags"
export CXXFLAGS_FOR_TARGET="$rs_target_cxxflags"
rs_do_command ../gcc/configure --prefix="$rs_archprefixdir" --target="$rs_target" --with-sysroot="$rs_archprefixdir" --with-pkgversion="RosBE-Windows" --enable-languages=c,c++ --enable-fully-dynamic-string --disable-shared --disable-multilib --disable-nls --disable-werror --disable-win32-registry --enable-sjlj-exceptions --disable-libstdcxx-verbose
rs_do_command ../gcc/configure --prefix="$rs_archprefixdir" --target="$rs_target" --with-sysroot="$rs_archprefixdir" --with-pkgversion="RosBE-Windows" --enable-languages=c,c++ --enable-fully-dynamic-string --enable-version-specific-runtime-libs --disable-shared --disable-multilib --disable-nls --disable-werror --disable-win32-registry --enable-sjlj-exceptions --disable-libstdcxx-verbose
rs_do_command $rs_makecmd -j $rs_cpucount all-gcc
rs_do_command $rs_makecmd install-gcc
rs_do_command $rs_makecmd install-lto-plugin
if rs_prepare_module "mingw_w64"; then
export AR="$rs_archprefixdir/bin/$rs_target-ar"
export AS="$rs_archprefixdir/bin/$rs_target-as"
export CC="$rs_archprefixdir/bin/$rs_target-gcc"
export AR="$rs_archprefixdir/bin/${rs_target_tool_prefix}ar"
export AS="$rs_archprefixdir/bin/${rs_target_tool_prefix}as"
export CC="$rs_archprefixdir/bin/${rs_target_tool_prefix}gcc"
export CFLAGS="$rs_target_cflags"
export CXX="$rs_archprefixdir/bin/$rs_target-g++"
export CXX="$rs_archprefixdir/bin/${rs_target_tool_prefix}g++"
export CXXFLAGS="$rs_target_cxxflags"
export DLLTOOL="$rs_archprefixdir/bin/$rs_target-dlltool"
export RANLIB="$rs_archprefixdir/bin/$rs_target-ranlib"
export STRIP="$rs_archprefixdir/bin/$rs_target-strip"
export DLLTOOL="$rs_archprefixdir/bin/${rs_target_tool_prefix}dlltool"
export RANLIB="$rs_archprefixdir/bin/${rs_target_tool_prefix}ranlib"
export STRIP="$rs_archprefixdir/bin/${rs_target_tool_prefix}strip"
rs_do_command ../mingw_w64/mingw-w64-crt/configure --prefix="$rs_archprefixdir/$rs_target" --host="$rs_target" --with-sysroot="$rs_archprefixdir"
rs_do_command $rs_makecmd -j $rs_cpucount
@ -250,9 +253,9 @@ rm -f lib/* >& /dev/null
echo "Removing debugging symbols..."
cd "$rs_workdir"
find -executable -type f -exec "$rs_archprefixdir/bin/$rs_target-strip" -s {} ";" >& /dev/null
find -name "*.a" -type f -exec "$rs_archprefixdir/bin/$rs_target-strip" -d {} ";" >& /dev/null
find -name "*.o" -type f -exec "$rs_archprefixdir/bin/$rs_target-strip" -d {} ";" >& /dev/null
find -executable -type f -exec $rs_archprefixdir/bin/${rs_target_tool_prefix}strip -s {} ";" >& /dev/null
find -name "*.a" -type f -exec $rs_archprefixdir/bin/${rs_target_tool_prefix}strip -d {} ";" >& /dev/null
find -name "*.o" -type f -exec $rs_archprefixdir/bin/${rs_target_tool_prefix}strip -d {} ";" >& /dev/null
echo "Copying additional dependencies from MSYS..."
cd "$rs_prefixdir/bin"

25
RosBE-Windows/Buildtoolchain/buildtoolchain-mingw32.sh
View File

@ -55,6 +55,9 @@ rs_target="i686-w64-mingw32"
rs_target_cflags="-pipe -O2 -Wl,-S -g0 -march=pentium -mtune=i686"
rs_target_cxxflags="$rs_target_cflags"
# This compiler has host=build=target, so it isn't prefixed.
rs_target_tool_prefix=""
export CC="$rs_host_cc"
export CFLAGS="$rs_host_cflags"
export CXX="$rs_host_cxx"
@ -229,21 +232,21 @@ if rs_prepare_module "gcc"; then
export CFLAGS_FOR_TARGET="$rs_target_cflags"
export CXXFLAGS_FOR_TARGET="$rs_target_cxxflags"
rs_do_command ../gcc/configure --prefix="$rs_archprefixdir" --host="$rs_target" --build="$rs_target" --target="$rs_target" --with-sysroot="$rs_archprefixdir" --with-pkgversion="RosBE-Windows" --enable-languages=c,c++ --enable-fully-dynamic-string --disable-shared --disable-multilib --disable-nls --disable-werror --disable-win32-registry --enable-sjlj-exceptions --disable-libstdcxx-verbose
rs_do_command ../gcc/configure --prefix="$rs_archprefixdir" --host="$rs_target" --build="$rs_target" --target="$rs_target" --with-sysroot="$rs_archprefixdir" --with-pkgversion="RosBE-Windows" --enable-languages=c,c++ --enable-fully-dynamic-string --enable-version-specific-runtime-libs --disable-shared --disable-multilib --disable-nls --disable-werror --disable-win32-registry --enable-sjlj-exceptions --disable-libstdcxx-verbose
rs_do_command $rs_makecmd -j $rs_cpucount all-gcc
rs_do_command $rs_makecmd install-gcc
rs_do_command $rs_makecmd install-lto-plugin
if rs_prepare_module "mingw_w64"; then
export AR="$rs_archprefixdir/bin/ar"
export AS="$rs_archprefixdir/bin/as"
export CC="$rs_archprefixdir/bin/gcc"
export AR="$rs_archprefixdir/bin/${rs_target_tool_prefix}ar"
export AS="$rs_archprefixdir/bin/${rs_target_tool_prefix}as"
export CC="$rs_archprefixdir/bin/${rs_target_tool_prefix}gcc"
export CFLAGS="$rs_target_cflags"
export CXX="$rs_archprefixdir/bin/g++"
export CXX="$rs_archprefixdir/bin/${rs_target_tool_prefix}g++"
export CXXFLAGS="$rs_target_cxxflags"
export DLLTOOL="$rs_archprefixdir/bin/dlltool"
export RANLIB="$rs_archprefixdir/bin/ranlib"
export STRIP="$rs_archprefixdir/bin/strip"
export DLLTOOL="$rs_archprefixdir/bin/${rs_target_tool_prefix}dlltool"
export RANLIB="$rs_archprefixdir/bin/${rs_target_tool_prefix}ranlib"
export STRIP="$rs_archprefixdir/bin/${rs_target_tool_prefix}strip"
rs_do_command ../mingw_w64/mingw-w64-crt/configure --prefix="$rs_archprefixdir/$rs_target" --host="$rs_target" --with-sysroot="$rs_archprefixdir"
rs_do_command $rs_makecmd -j $rs_cpucount
@ -300,9 +303,9 @@ rm -f lib/* >& /dev/null
echo "Removing debugging symbols..."
cd "$rs_workdir"
find -executable -type f -exec strip -s {} ";" >& /dev/null
find -name "*.a" -type f -exec strip -d {} ";" >& /dev/null
find -name "*.o" -type f -exec strip -d {} ";" >& /dev/null
find -executable -type f -exec $rs_archprefixdir/bin/${rs_target_tool_prefix}strip -s {} ";" >& /dev/null
find -name "*.a" -type f -exec $rs_archprefixdir/bin/${rs_target_tool_prefix}strip -d {} ";" >& /dev/null
find -name "*.o" -type f -exec $rs_archprefixdir/bin/${rs_target_tool_prefix}strip -d {} ";" >& /dev/null
echo "Copying additional dependencies from MSYS..."
cd "$rs_prefixdir/bin"