* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "../../pch.h"
{ HostTrue, "", "", "" }, // BuildTool
{ HostFalse, "", "", "" }, // StaticLibrary
{ HostFalse, "", "", "" }, // ObjectLibrary
- { HostFalse, "", "", "" }, // Kernel
- { HostFalse, "", "", "" }, // KernelModeDLL
- { HostFalse, "-D__NTDRIVER__", "", "" }, // KernelModeDriver
- { HostFalse, "", "", "" }, // NativeDLL
- { HostFalse, "-D__NTAPP__", "", "" }, // NativeCUI
- { HostFalse, "", "", "" }, // Win32DLL
- { HostFalse, "", "", "" }, // Win32OCX
- { HostFalse, "", "", "" }, // Win32CUI
- { HostFalse, "", "", "" }, // Win32GUI
- { HostFalse, "", "", "-nostartfiles -nostdlib" }, // BootLoader
+ { HostFalse, "", "", "$(LDFLAG_DRIVER)" }, // Kernel
+ { HostFalse, "", "", "$(LDFLAG_DRIVER)" }, // KernelModeDLL
+ { HostFalse, "-D__NTDRIVER__", "", "$(LDFLAG_DRIVER)" }, // KernelModeDriver
+ { HostFalse, "", "", "$(LDFLAG_DLL)" }, // NativeDLL
+ { HostFalse, "-D__NTAPP__", "", "$(LDFLAG_NATIVE)" }, // NativeCUI
+ { HostFalse, "", "", "$(LDFLAG_DLL)" }, // Win32DLL
+ { HostFalse, "", "", "$(LDFLAG_DLL)" }, // Win32OCX
+ { HostFalse, "", "", "$(LDFLAG_CONSOLE)" }, // Win32CUI
+ { HostFalse, "", "", "$(LDFLAG_WINDOWS)" }, // Win32GUI
+ { HostFalse, "", "", "" }, // BootLoader
{ HostFalse, "", "-f bin", "" }, // BootSector
{ HostFalse, "", "", "" }, // Iso
{ HostFalse, "", "", "" }, // LiveIso
{ HostFalse, "", "", "" }, // RpcServer
{ HostFalse, "", "", "" }, // RpcClient
{ HostFalse, "", "", "" }, // Alias
- { HostFalse, "", "", "-nostartfiles -nostdlib" }, // BootProgram
- { HostFalse, "", "", "" }, // Win32SCR
+ { HostFalse, "", "", "" }, // BootProgram
+ { HostFalse, "", "", "$(LDFLAG_WINDOWS)" }, // Win32SCR
{ HostFalse, "", "", "" }, // IdlHeader
- { HostFalse, "", "", "" }, // IsoRegTest
- { HostFalse, "", "", "" }, // LiveIsoRegTest
+ { HostFalse, "", "", "" }, // IdlInterface
{ HostFalse, "", "", "" }, // EmbeddedTypeLib
{ HostFalse, "", "", "" }, // ElfExecutable
{ HostFalse, "", "", "" }, // RpcProxy
{ HostTrue, "", "", "" }, // HostStaticLibrary
{ HostFalse, "", "", "" }, // Cabinet
- { HostFalse, "", "", "" }, // KeyboardLayout
+ { HostFalse, "", "", "$(LDFLAG_DLL)" }, // KeyboardLayout
{ HostFalse, "", "", "" }, // MessageHeader
};
+static std::string mscPath;
+static std::string mslinkPath;
+
string
MingwBackend::GetFullPath ( const FileLocation& file ) const
{
{
const FileLocation& file = files[i];
if ( wrap_at > 0 && wrap_count++ == wrap_at )
+ {
s += " \\\n\t\t";
+ wrap_count = 1;
+ }
else if ( s.size() )
s += " ";
s += backend->GetFullName ( file );
if ( !v[i].size() )
continue;
if ( wrap_at > 0 && wrap_count++ == wrap_at )
+ {
s += " \\\n\t\t";
+ wrap_count = 1;
+ }
else if ( s.size() )
s += " ";
s += v[i];
vector<MingwModuleHandler*> v;
size_t i;
+ for ( std::map<std::string, Module*>::iterator p = ProjectNode.modules.begin (); p != ProjectNode.modules.end (); ++ p )
+ fprintf ( fMakefile, "%s_TYPE:=%u\n", p->second->name.c_str(), p->second->type );
+
for ( std::map<std::string, Module*>::iterator p = ProjectNode.modules.begin (); p != ProjectNode.modules.end (); ++ p )
{
Module& module = *p->second;
GenerateTestSupportCode ();
GenerateCompilationUnitSupportCode ();
GenerateSysSetup ();
+ GenerateInstallerFileList();
GenerateProxyMakefiles ();
CheckAutomaticDependencies ();
CloseMakefile ();
}
+void
+MingwBackend::GenerateInstallerFileList()
+{
+ this->ProjectNode.GenerateInstallerFileList();
+}
+
void
MingwBackend::CreateMakefile ()
{
}
void
-MingwBackend::GenerateProjectCFlagsMacro ( const char* assignmentOperation,
- const IfableData& data ) const
-{
- set<string> used_defs;
-
- if ( data.includes.size () > 0 )
- fprintf (
- fMakefile,
- "PROJECT_CINCLUDES %s %s\n",
- assignmentOperation,
- MingwModuleHandler::GenerateGccIncludeParametersFromVector ( data.includes ).c_str ());
-
- if ( data.defines.size () > 0 )
- fprintf (
- fMakefile,
- "PROJECT_CDEFINES %s %s\n",
- assignmentOperation,
- MingwModuleHandler::GenerateGccDefineParametersFromVector ( data.defines, used_defs ).c_str ());
-}
-
-void
-MingwBackend::GenerateGlobalCFlagsAndProperties (
+MingwBackend::GenerateGlobalProperties (
const char* assignmentOperation,
const IfableData& data ) const
{
prop.value.c_str() );
}
}
+}
- if ( data.includes.size() || data.defines.size() )
+string
+MingwBackend::GenerateProjectLDFLAGS () const
+{
+ string ldflags;
+ for ( size_t i = 0; i < ProjectNode.linkerFlags.size (); i++ )
{
- GenerateProjectCFlagsMacro ( assignmentOperation,
- data );
+ LinkerFlag& linkerFlag = *ProjectNode.linkerFlags[i];
+ if ( ldflags.length () > 0 )
+ ldflags += " ";
+ ldflags += linkerFlag.flag;
}
+ return ldflags;
}
void
-MingwBackend::GenerateProjectGccOptionsMacro ( const char* assignmentOperation,
- IfableData& data ) const
+MingwBackend::GenerateGlobalVariables () const
{
- size_t i;
+ fputs ( "include tools$(SEP)rbuild$(SEP)backend$(SEP)mingw$(SEP)rules.mak\n", fMakefile );
+ fprintf ( fMakefile, "include tools$(SEP)rbuild$(SEP)backend$(SEP)mingw$(SEP)linkers$(SEP)%s.mak\n", ProjectNode.GetLinkerSet ().c_str () );
+ fprintf ( fMakefile, "include tools$(SEP)rbuild$(SEP)backend$(SEP)mingw$(SEP)compilers$(SEP)%s.mak\n", ProjectNode.GetCompilerSet ().c_str () );
+
+ if ( mscPath.length() )
+ fprintf ( fMakefile, "export RBUILD_CL_PATH=%s\n", mscPath.c_str () );
- fprintf (
- fMakefile,
- "PROJECT_GCCOPTIONS %s",
- assignmentOperation );
+ if ( mslinkPath.length() )
+ fprintf ( fMakefile, "export RBUILD_LINK_PATH=%s\n", mslinkPath.c_str () );
- for ( i = 0; i < data.compilerFlags.size(); i++ )
+ if ( configuration.Dependencies == FullDependencies )
{
- if ( data.compilerFlags[i]->compiler == CompilerTypeDontCare )
- {
- fprintf (
- fMakefile,
- " %s",
- data.compilerFlags[i]->flag.c_str() );
- }
+ fprintf ( fMakefile,
+ "ifeq ($(ROS_BUILDDEPS),)\n"
+ "ROS_BUILDDEPS:=%s\n"
+ "endif\n",
+ "full" );
}
- fputs ( "\n", fMakefile );
+ fprintf ( fMakefile,
+ "PREFIX := %s\n",
+ compilerPrefix.c_str () );
+ fprintf ( fMakefile,
+ "nasm := $(Q)%s\n",
+ nasmCommand.c_str () );
- // TODO: reference these from somewhere
- fprintf (
- fMakefile,
- "PROJECT_GCC_CFLAGS %s",
- assignmentOperation );
+ GenerateGlobalProperties ( "=", ProjectNode.non_if_data );
- for ( i = 0; i < data.compilerFlags.size(); i++ )
+ if ( ProjectNode.configuration.Compiler == GnuGcc )
{
- if ( data.compilerFlags[i]->compiler == CompilerTypeCC )
+ fprintf ( fMakefile, "ifneq ($(OARCH),)\n" );
+ fprintf ( fMakefile, "PROJECT_ASFLAGS += -march=$(OARCH)\n" );
+ fprintf ( fMakefile, "PROJECT_CFLAGS += -march=$(OARCH)\n" );
+ fprintf ( fMakefile, "PROJECT_CXXFLAGS += -march=$(OARCH)\n" );
+ fprintf ( fMakefile, "endif\n" );
+ fprintf ( fMakefile, "ifneq ($(TUNE),)\n" );
+ fprintf ( fMakefile, "PROJECT_CFLAGS += -mtune=$(TUNE)\n" );
+ fprintf ( fMakefile, "PROJECT_CXXFLAGS += -mtune=$(TUNE)\n" );
+ fprintf ( fMakefile, "endif\n" );
+
+ if ( usePipe )
{
- fprintf (
- fMakefile,
- " %s",
- data.compilerFlags[i]->flag.c_str() );
+ fprintf ( fMakefile, "PROJECT_CFLAGS += -pipe\n" );
+ fprintf ( fMakefile, "PROJECT_CXXFLAGS += -pipe\n" );
+ fprintf ( fMakefile, "PROJECT_ASFLAGS += -pipe\n" );
}
- }
- fputs ( "\n", fMakefile );
+ // Would be nice to have our own C++ runtime
+ fputs ( "BUILTIN_CXXINCLUDES+= $(TARGET_CPPFLAGS)\n", fMakefile );
+
+ fprintf ( fMakefile, "PROJECT_CCLIBS := \"$(shell ${TARGET_CC} -print-libgcc-file-name)\"\n" );
+
+ // We use our proprietary "ofmt_stub.a" to implement a stub for "_get_output_format" required by "libmingwex.a".
+ // This archive just contains the compiled "ofmt_stub.s" supplied with the MinGW Runtime sources.
+ fprintf ( fMakefile, "PROJECT_CXXLIBS := \"$(shell ${TARGET_CPP} -print-file-name=libstdc++.a)\" \"$(shell ${TARGET_CPP} -print-libgcc-file-name)\" \"$(shell ${TARGET_CPP} -print-file-name=libmingw32.a)\" \"$(shell ${TARGET_CPP} -print-file-name=libmingwex.a)\" \"$(shell ${TARGET_CPP} -print-file-name=ofmt_stub.a)\" \"$(shell ${TARGET_CPP} -print-file-name=libcoldname.a)\"\n" );
+
+ /* hack to get libgcc_eh.a, should check mingw version or something */
+ if (Environment::GetArch() == "amd64")
+ fprintf ( fMakefile, " \"$(shell ${TARGET_CPP} -print-file-name=libgcc_eh.a)\"" );
+ /* hack to get _get_output_format, needed by libmingwex */
+ else if (Environment::GetArch() == "i386")
+ fprintf ( fMakefile, "\"$(shell ${TARGET_CPP} -print-file-name=ofmt_stub.a)\"");
+ fprintf ( fMakefile,"\n");
+ }
+ MingwModuleHandler::GenerateParameters ( "PROJECT", "+=", ProjectNode.non_if_data );
+ MingwModuleHandler::GenerateParameters ( "PROJECT_HOST", "+=", ProjectNode.host_non_if_data );
- fprintf (
- fMakefile,
- "PROJECT_GCC_CXXFLAGS %s",
- assignmentOperation );
+ fprintf ( fMakefile, "PROJECT_LDFLAGS := %s\n", GenerateProjectLDFLAGS ().c_str () );
- for ( i = 0; i < data.compilerFlags.size(); i++ )
+ // TODO: use symbolic names for module types
+ for ( size_t i = 0; i < sizeof(ModuleHandlerInformations) / sizeof(ModuleHandlerInformations[0]); ++ i )
{
- if ( data.compilerFlags[i]->compiler == CompilerTypeCPP )
+ if ( ModuleHandlerInformations[i].cflags && ModuleHandlerInformations[i].cflags[0] )
{
- fprintf (
- fMakefile,
- " %s",
- data.compilerFlags[i]->flag.c_str() );
+ fprintf ( fMakefile,
+ "MODULETYPE%d_%sFLAGS:=%s\n",
+ (int)i,
+ "C",
+ ModuleHandlerInformations[i].cflags );
}
- }
-
- fputs ( "\n", fMakefile );
-}
-void
-MingwBackend::GenerateProjectGccOptions (
- const char* assignmentOperation,
- IfableData& data ) const
-{
- if ( data.compilerFlags.size() )
- {
- GenerateProjectGccOptionsMacro ( assignmentOperation,
- data );
- }
-}
+ if ( ModuleHandlerInformations[i].nasmflags && ModuleHandlerInformations[i].nasmflags[0] )
+ {
+ fprintf ( fMakefile,
+ "MODULETYPE%d_%sFLAGS:=%s\n",
+ (int)i,
+ "NASM",
+ ModuleHandlerInformations[i].nasmflags );
+ }
-string
-MingwBackend::GenerateProjectLFLAGS () const
-{
- string lflags;
- for ( size_t i = 0; i < ProjectNode.linkerFlags.size (); i++ )
- {
- LinkerFlag& linkerFlag = *ProjectNode.linkerFlags[i];
- if ( lflags.length () > 0 )
- lflags += " ";
- lflags += linkerFlag.flag;
+ if ( ModuleHandlerInformations[i].linkerflags && ModuleHandlerInformations[i].linkerflags[0] )
+ {
+ fprintf ( fMakefile,
+ "MODULETYPE%d_%sFLAGS:=%s\n",
+ (int)i,
+ "LD",
+ ModuleHandlerInformations[i].linkerflags );
+ }
}
- return lflags;
-}
-
-void
-MingwBackend::GenerateGlobalVariables () const
-{
- fputs ( "include tools$(SEP)rbuild$(SEP)backend$(SEP)mingw$(SEP)rules.mak\n", fMakefile );
- if ( configuration.Dependencies == FullDependencies )
- {
- fprintf ( fMakefile,
- "ifeq ($(ROS_BUILDDEPS),)\n"
- "ROS_BUILDDEPS:=%s\n"
- "endif\n",
- "full" );
- }
+ fprintf ( fMakefile,
+ "MODULETYPE%d_KMODE:=yes\n",
+ (int)Kernel );
fprintf ( fMakefile,
- "PREFIX := %s\n",
- compilerPrefix.c_str () );
+ "MODULETYPE%d_KMODE:=yes\n",
+ (int)KernelModeDLL );
+
fprintf ( fMakefile,
- "nasm := %s\n",
- nasmCommand.c_str () );
+ "MODULETYPE%d_KMODE:=yes\n",
+ (int)KernelModeDriver );
- GenerateGlobalCFlagsAndProperties ( "=", ProjectNode.non_if_data );
- GenerateProjectGccOptions ( "=", ProjectNode.non_if_data );
-
- fprintf ( fMakefile, "PROJECT_RCFLAGS := $(PROJECT_CINCLUDES) $(PROJECT_CDEFINES)\n" );
- fprintf ( fMakefile, "PROJECT_WIDLFLAGS := $(PROJECT_CINCLUDES) $(PROJECT_CDEFINES)\n" );
- fprintf ( fMakefile, "PROJECT_LFLAGS := '$(shell ${TARGET_CC} -print-libgcc-file-name)' %s\n", GenerateProjectLFLAGS ().c_str () );
- fprintf ( fMakefile, "PROJECT_LPPFLAGS := '$(shell ${TARGET_CPP} -print-file-name=libstdc++.a)' '$(shell ${TARGET_CPP} -print-file-name=libgcc.a)' '$(shell ${TARGET_CPP} -print-file-name=libmingw32.a)' '$(shell ${TARGET_CPP} -print-file-name=libmingwex.a)' '$(shell ${TARGET_CPP} -print-file-name=libcoldname.a)'\n" );
- /* hack to get libgcc_eh.a, should check mingw version or something */
- fprintf ( fMakefile, "ifeq ($(ARCH),amd64)\n" );
- fprintf ( fMakefile, "PROJECT_LPPFLAGS += '$(shell ${TARGET_CPP} -print-file-name=libgcc_eh.a)'\n" );
- fprintf ( fMakefile, "endif\n" );
- fprintf ( fMakefile, "PROJECT_GCCOPTIONS += -Wall\n" );
- fprintf ( fMakefile, "ifneq ($(OARCH),)\n" );
- fprintf ( fMakefile, "PROJECT_GCCOPTIONS += -march=$(OARCH)\n" );
- fprintf ( fMakefile, "endif\n" );
- fprintf ( fMakefile, "ifneq ($(TUNE),)\n" );
- fprintf ( fMakefile, "PROJECT_GCCOPTIONS += -mtune=$(TUNE)\n" );
- fprintf ( fMakefile, "endif\n" );
- fprintf ( fMakefile, "PROJECT_CFLAGS = $(PROJECT_GCCOPTIONS) $(PROJECT_GCC_CFLAGS)\n" );
- fprintf ( fMakefile, "PROJECT_CXXFLAGS = $(PROJECT_GCCOPTIONS) $(PROJECT_GCC_CXXFLAGS)\n" );
fprintf ( fMakefile, "\n" );
}
return false;
if ( module.type == LiveIso )
return false;
- if ( module.type == IsoRegTest )
- return false;
- if ( module.type == LiveIsoRegTest )
- return false;
if ( module.type == Test )
return false;
if ( module.type == Alias )
printf ( "Detecting compiler..." );
bool detectedCompiler = false;
- const string& ROS_PREFIXValue = Environment::GetVariable ( "ROS_PREFIX" );
- if ( ROS_PREFIXValue.length () > 0 )
+ bool supportedCompiler = false;
+ string compilerVersion;
+
+ if ( ProjectNode.configuration.Compiler == GnuGcc )
{
- compilerPrefix = ROS_PREFIXValue;
- compilerCommand = compilerPrefix + "-gcc";
- detectedCompiler = TryToDetectThisCompiler ( compilerCommand );
- }
+ const string& TARGET_CCValue = Environment::GetVariable ( "TARGET_CC" );
+ const string& ROS_PREFIXValue = Environment::GetVariable ( "ROS_PREFIX" );
+
+ if ( TARGET_CCValue.length () > 0 )
+ {
+ compilerPrefix = "";
+ compilerCommand = TARGET_CCValue;
+ detectedCompiler = TryToDetectThisCompiler ( compilerCommand );
+ }
+
+ if ( !detectedCompiler )
+ {
+ if ( ROS_PREFIXValue.length () > 0 )
+ {
+ compilerPrefix = ROS_PREFIXValue;
+ compilerCommand = compilerPrefix + "-gcc";
+ detectedCompiler = TryToDetectThisCompiler ( compilerCommand );
+ }
+ }
#if defined(WIN32)
- if ( !detectedCompiler )
- {
- compilerPrefix = "";
- compilerCommand = "gcc";
- detectedCompiler = TryToDetectThisCompiler ( compilerCommand );
- }
+ if ( !detectedCompiler )
+ {
+ compilerPrefix = "";
+ compilerCommand = "gcc";
+ detectedCompiler = TryToDetectThisCompiler ( compilerCommand );
+ }
#endif
- if ( !detectedCompiler )
+ if ( !detectedCompiler )
+ {
+ compilerPrefix = "mingw32";
+ compilerCommand = compilerPrefix + "-gcc";
+ detectedCompiler = TryToDetectThisCompiler ( compilerCommand );
+ }
+
+ if ( detectedCompiler )
+ compilerVersion = GetCompilerVersion ( compilerCommand );
+
+ supportedCompiler = IsSupportedCompilerVersion ( compilerVersion );
+ }
+ else if ( ProjectNode.configuration.Compiler == MicrosoftC )
{
- compilerPrefix = "mingw32";
- compilerCommand = compilerPrefix + "-gcc";
- detectedCompiler = TryToDetectThisCompiler ( compilerCommand );
+ compilerCommand = "cl";
+ detectedCompiler = DetectMicrosoftCompiler ( compilerVersion, mscPath );
+ supportedCompiler = true; // TODO
}
if ( detectedCompiler )
{
- string compilerVersion = GetCompilerVersion ( compilerCommand );
- if ( IsSupportedCompilerVersion ( compilerVersion ) )
+ if ( supportedCompiler )
printf ( "detected (%s %s)\n", compilerCommand.c_str (), compilerVersion.c_str() );
else
{
buffer[i] = '\0';
pclose ( fp );
- char separators[] = " ()";
+ char separators[] = " ()\n";
char *token;
char *prevtoken = NULL;
string
MingwBackend::GetCompilerVersion ( const string& compilerCommand )
{
- string versionCommand = ssprintf ( "%s --version gcc",
+ string versionCommand = ssprintf ( "%s --version",
compilerCommand.c_str (),
NUL,
NUL );
bool
MingwBackend::IsSupportedCompilerVersion ( const string& compilerVersion )
{
- if ( strcmp ( compilerVersion.c_str (), "3.4.2") < 0 )
+ if ( strcmp ( compilerVersion.c_str (), "4.4.0") < 0 )
return false;
else
return true;
bool
MingwBackend::IsSupportedBinutilsVersion ( const string& binutilsVersion )
{
- if ( manualBinutilsSetting ) return true;
-
- /* linux */
- if ( binutilsVersion.find('.') != std::string::npos )
+ int digit = binutilsVersion.find_last_of(".");
+ if(digit == -1)
+ {
+ printf("Unable to detect binutils version!\n");
+ return false;
+ }
+
+ string date = string(binutilsVersion, digit + 1);
+ if(date.length() == 8)
{
- /* TODO: blacklist versions on version number instead of date */
- return true;
+ /* This is a real date in the format YYYYMMDD.
+ Check whether we have at least Binutils 20091016 (the oldest one
+ we were still using after upgrading to RosBE 1.5). */
+ if(strcmp(date.c_str(), "20091016") < 0)
+ return false;
}
-
- /*
- * - Binutils older than 2003/10/01 have broken windres which can't handle
- * icons with alpha channel.
- * - Binutils between 2004/09/02 and 2004/10/08 have broken handling of
- * forward exports in dlltool.
- */
- if ( ( ( strcmp ( binutilsVersion.c_str (), "20040902") >= 0 ) &&
- ( strcmp ( binutilsVersion.c_str (), "20041008") <= 0 ) ) ||
- ( strcmp ( binutilsVersion.c_str (), "20031001") < 0 ) )
- return false;
else
- return true;
+ {
+ /* This is no date, so binutilsVersion should just contain the version
+ number.
+ Binutils 2.20 will hopefully contain the required features. */
+ if(strcmp(binutilsVersion.c_str(), "2.20") < 0)
+ return false;
+ }
+
+ return true;
}
void
printf ( "Detecting binutils..." );
bool detectedBinutils = false;
- const string& ROS_PREFIXValue = Environment::GetVariable ( "ROS_PREFIX" );
+ bool supportedBinutils = false;
+ string binutilsVersion;
- if ( ROS_PREFIXValue.length () > 0 )
+ if ( ProjectNode.configuration.Linker == GnuLd )
{
- binutilsPrefix = ROS_PREFIXValue;
- binutilsCommand = binutilsPrefix + "-ld";
- manualBinutilsSetting = true;
- detectedBinutils = true;
- }
+ const string& ROS_PREFIXValue = Environment::GetVariable ( "ROS_PREFIX" );
+
+ if ( ROS_PREFIXValue.length () > 0 )
+ {
+ binutilsPrefix = ROS_PREFIXValue;
+ binutilsCommand = binutilsPrefix + "-ld";
+ manualBinutilsSetting = true;
+ detectedBinutils = true;
+ }
#if defined(WIN32)
- if ( !detectedBinutils )
- {
- binutilsPrefix = "";
- binutilsCommand = "ld";
- detectedBinutils = TryToDetectThisBinutils ( binutilsCommand );
- }
+ if ( !detectedBinutils )
+ {
+ binutilsPrefix = "";
+ binutilsCommand = "ld";
+ detectedBinutils = TryToDetectThisBinutils ( binutilsCommand );
+ }
#endif
- if ( !detectedBinutils )
+ if ( !detectedBinutils )
+ {
+ binutilsPrefix = "mingw32";
+ binutilsCommand = binutilsPrefix + "-ld";
+ detectedBinutils = TryToDetectThisBinutils ( binutilsCommand );
+ }
+ if ( detectedBinutils )
+ {
+ binutilsVersion = GetBinutilsVersionDate ( binutilsCommand );
+ supportedBinutils = IsSupportedBinutilsVersion ( binutilsVersion );
+ }
+ }
+ else if ( ProjectNode.configuration.Linker == MicrosoftLink )
{
- binutilsPrefix = "mingw32";
- binutilsCommand = binutilsPrefix + "-ld";
- detectedBinutils = TryToDetectThisBinutils ( binutilsCommand );
+ compilerCommand = "link";
+ detectedBinutils = DetectMicrosoftLinker ( binutilsVersion, mslinkPath );
+ supportedBinutils = true; // TODO
}
+
if ( detectedBinutils )
{
- string binutilsVersion = GetBinutilsVersionDate ( binutilsCommand );
- if ( IsSupportedBinutilsVersion ( binutilsVersion ) )
- printf ( "detected (%s %s)\n", binutilsCommand.c_str (), GetBinutilsVersion( binutilsCommand ).c_str() );
+ if ( supportedBinutils )
+ printf ( "detected (%s %s)\n", binutilsCommand.c_str (), binutilsVersion.c_str() );
else
{
printf ( "detected (%s), but with unsupported version (%s)\n",
void
MingwBackend::DetectPipeSupport ()
{
- printf ( "Detecting compiler -pipe support..." );
-
- string pipe_detection = "tools" + sSep + "rbuild" + sSep + "backend" + sSep + "mingw" + sSep + "pipe_detection.c";
- string pipe_detectionObjectFilename = ReplaceExtension ( pipe_detection,
- ".o" );
- string command = ssprintf (
- "%s -pipe -c %s -o %s 1>%s 2>%s",
- FixSeparatorForSystemCommand(compilerCommand).c_str (),
- pipe_detection.c_str (),
- pipe_detectionObjectFilename.c_str (),
- NUL,
- NUL );
- int exitcode = system ( command.c_str () );
- FILE* f = fopen ( pipe_detectionObjectFilename.c_str (), "rb" );
- if ( f )
+ if ( ProjectNode.configuration.Compiler == GnuGcc )
{
- usePipe = (exitcode == 0);
- fclose ( f );
- unlink ( pipe_detectionObjectFilename.c_str () );
+ printf ( "Detecting compiler -pipe support..." );
+
+ string pipe_detection = "tools" + sSep + "rbuild" + sSep + "backend" + sSep + "mingw" + sSep + "pipe_detection.c";
+ string pipe_detectionObjectFilename = ReplaceExtension ( pipe_detection,
+ ".o" );
+ string command = ssprintf (
+ "%s -pipe -c %s -o %s 1>%s 2>%s",
+ FixSeparatorForSystemCommand(compilerCommand).c_str (),
+ pipe_detection.c_str (),
+ pipe_detectionObjectFilename.c_str (),
+ NUL,
+ NUL );
+ int exitcode = system ( command.c_str () );
+ FILE* f = fopen ( pipe_detectionObjectFilename.c_str (), "rb" );
+ if ( f )
+ {
+ usePipe = (exitcode == 0);
+ fclose ( f );
+ unlink ( pipe_detectionObjectFilename.c_str () );
+ }
+ else
+ usePipe = false;
+
+ if ( usePipe )
+ printf ( "detected\n" );
+ else
+ printf ( "not detected\n" );
}
else
usePipe = false;
-
- if ( usePipe )
- printf ( "detected\n" );
- else
- printf ( "not detected\n" );
}
void
{
printf ( "Detecting compiler pre-compiled header support..." );
- if ( configuration.PrecompiledHeadersEnabled )
+ if ( configuration.PrecompiledHeadersEnabled && ProjectNode.configuration.Compiler == GnuGcc )
{
string path = "tools" + sSep + "rbuild" + sSep + "backend" + sSep + "mingw" + sSep + "pch_detection.h";
string cmd = ssprintf (
"install_registry: %s\n",
registryTargetFiles.c_str () );
fprintf ( fMakefile,
- "%s: %s %s $(MKHIVE_TARGET)\n",
+ "%s: %s %s $(mkhive_TARGET)\n",
registryTargetFiles.c_str (),
registrySourceFiles.c_str (),
GetFullPath ( system32 ).c_str () );
fprintf ( fMakefile,
"\t$(ECHO_MKHIVE)\n" );
fprintf ( fMakefile,
- "\t$(MKHIVE_TARGET) boot%cbootdata %s $(ARCH) boot%cbootdata%chiveinst_$(ARCH).inf\n",
+ "\t$(mkhive_TARGET) boot%cbootdata %s $(ARCH) boot%cbootdata%chiveinst_$(ARCH).inf\n",
cSep, GetFullPath ( system32 ).c_str (),
cSep, cSep );
fprintf ( fMakefile,
projects / reactos.git / blobdiff