diff options
author | Tor Lillqvist <tlillqvist@novell.com> | 2011-08-29 17:44:48 +0300 |
---|---|---|
committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-08-29 20:39:01 +0300 |
commit | 5007d5c54381c2f86f0e6a30d7a9931b4793da3b (patch) | |
tree | 1f0f3e8f50da9838711a3425d683f845842cc683 /set_soenv.in | |
parent | use -D$(CPUNAME) for all platforms also in gbuild (diff) | |
download | core-5007d5c54381c2f86f0e6a30d7a9931b4793da3b.tar.gz core-5007d5c54381c2f86f0e6a30d7a9931b4793da3b.zip |
MinGW cross-compilation improvements
Make sure the MINGW_FOO environment variables get set and propagated
to the build environment also in the MinGW cross-compilation case. The
OOo code used to do that for MinGW natively on Windows (under
Cygwin). (Which we don't intend to support.)
Now, whether the *use* of these variables in the various makefiles etc
is relevant any more remains to be seen. I suspect all that might well
be unnecessary, as we after all are capable of cross-build the code
using MinGW just fine currently with none of these MINGW_FOO being
set.
One place where at least MINGW_GCCDLL and MINGW_GXXDLL is needed,
though, is in scp2. We presumably do want to include these DLLs (the
shared libgcc and libstdc++) in the installation set, to the extent
the scp2 stuff can be used still in a MinGW cross-build context.
Diffstat (limited to 'set_soenv.in')
-rwxr-xr-x | set_soenv.in | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/set_soenv.in b/set_soenv.in index b79c70d9ff8d..2cb9829be9c3 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -1630,6 +1630,13 @@ elsif ( $platform =~ m/mingw32/ ) { ToFile( "NSIS_PATH", $NSIS_PATH, "e" ); ToFile( "DISABLE_ACTIVEX", "@DISABLE_ACTIVEX@","e" ); ToFile( "DISABLE_ATL", "@DISABLE_ATL@", "e" ); + ToFile( "MINGW_CLIB_DIR", "@MINGW_CLIB_DIR@", "e" ); + ToFile( "MINGW_SHARED_GCCLIB", "@MINGW_SHARED_GCCLIB@", "e" ); + ToFile( "MINGW_SHARED_GXXLIB", "@MINGW_SHARED_GXXLIB@", "e" ); + ToFile( "MINGW_SHARED_LIBSTDCPP", "@MINGW_SHARED_LIBSTDCPP@", "e" ); + ToFile( "MINGW_GCCDLL", "@MINGW_GCCDLL@", "e" ); + ToFile( "MINGW_GXXDLL", "@MINGW_GXXDLL@", "e" ); + } if ("@WITH_VC_REDIST@" eq "TRUE") { |