[ros-diffs] [sserapion] 41821: The beginning of the Makefile has comments about the usage of special build flags, one of them, ROS_PREFIX has this notice: "Don't include the dash (-) before gcc.". RBuild has grown up and used the documented behavior but RosBE and the makefile itself isn't consistent and ignore this tidbit. Attempt to fix build for amd64 and others that use ROS_PREFIX on windows, current rosbe + addon for amd64 dont work without patching the scripts, call me for details...

Author: sserapion
Date: Thu Jul  9 05:28:44 2009
New Revision: 41821

URL: http://svn.reactos.org/svn/reactos?rev=41821&view=rev
Log:
The beginning of the Makefile has comments about the usage of special build flags, one of
them, ROS_PREFIX has this notice: "Don't include the dash (-) before gcc.".
RBuild has grown up and used the documented behavior but RosBE and the makefile itself
isn't consistent and ignore this tidbit.

Attempt to fix build for amd64 and others that use ROS_PREFIX on windows, current rosbe +
addon for amd64 dont work without patching the scripts, call me for details...

Modified:
    branches/ros-amd64-bringup/reactos/Makefile
    branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp

Modified: branches/ros-amd64-bringup/reactos/Makefile
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/Makef…
==============================================================================
--- branches/ros-amd64-bringup/reactos/Makefile [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/Makefile [iso-8859-1] Thu Jul  9 05:28:44 2009
@@ -303,31 +303,31 @@
 
 # Set target compiler/linker
 ifneq ($(ROS_PREFIX),)
-  PREFIX_ := $(ROS_PREFIX)-
+  PREFIX_ := $(ROS_PREFIX)
 else
   ifeq ($(HOST),mingw32-linux)
-    PREFIX_ := mingw32-
+    PREFIX_ := mingw32
   else
     PREFIX_ :=
   endif
 endif
 ifeq ($(TARGET_CC),)
-  TARGET_CC = $(PREFIX_)gcc
+  TARGET_CC = $(PREFIX_)-gcc
 endif
 ifeq ($(TARGET_CPP),)
-  TARGET_CPP = $(PREFIX_)g++
+  TARGET_CPP = $(PREFIX_)-g++
 endif
 gcc = $(Q)$(TARGET_CC)
 gpp = $(Q)$(TARGET_CPP)
 gas = $(Q)$(TARGET_CC) -x assembler-with-cpp
-ld = $(Q)$(PREFIX_)ld
-nm = $(Q)$(PREFIX_)nm
-objdump = $(Q)$(PREFIX_)objdump
-ar = $(Q)$(PREFIX_)ar
-objcopy = $(Q)$(PREFIX_)objcopy
-dlltool = $(Q)$(PREFIX_)dlltool
-strip = $(Q)$(PREFIX_)strip
-windres = $(Q)$(PREFIX_)windres
+ld = $(Q)$(PREFIX_)-ld
+nm = $(Q)$(PREFIX_)-nm
+objdump = $(Q)$(PREFIX_)-objdump
+ar = $(Q)$(PREFIX_)-ar
+objcopy = $(Q)$(PREFIX_)-objcopy
+dlltool = $(Q)$(PREFIX_)-dlltool
+strip = $(Q)$(PREFIX_)-strip
+windres = $(Q)$(PREFIX_)-windres
 
 # Set utilities
 ifeq ($(OSTYPE),msys)

Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools…
==============================================================================
--- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1]
Thu Jul  9 05:28:44 2009
@@ -749,7 +749,7 @@
 		if ( ROS_PREFIXValue.length () > 0 )
 		{
 			compilerPrefix = ROS_PREFIXValue;
-			compilerCommand = compilerPrefix + "gcc";
+			compilerCommand = compilerPrefix + "-gcc";
 			detectedCompiler = TryToDetectThisCompiler ( compilerCommand );
 		}
 #if defined(WIN32)
@@ -993,7 +993,7 @@
 		if ( ROS_PREFIXValue.length () > 0 )
 		{
 			binutilsPrefix = ROS_PREFIXValue;
-			binutilsCommand = binutilsPrefix + "ld";
+			binutilsCommand = binutilsPrefix + "-ld";
 			manualBinutilsSetting = true;
 			detectedBinutils = true;
 		}