ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 19:26:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source 
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...

svn path=/branches/ros-amd64-bringup/; revision=41821
This commit is contained in:
Samuel Serapion
2009-07-09 01:28:44 +00:00
parent e89338deae
commit db63f43bde
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/Makefile
+12 -12
View File
@@ -303,31 +303,31 @@ host_objcopy = $(Q)objcopy
# 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)
reactos/tools/rbuild/backend/mingw/mingw.cpp
+2 -2
View File
@@ -749,7 +749,7 @@ MingwBackend::DetectCompiler ()
if ( ROS_PREFIXValue.length () > 0 )
{
compilerPrefix = ROS_PREFIXValue;
compilerCommand = compilerPrefix + "gcc";
compilerCommand = compilerPrefix + "-gcc";
detectedCompiler = TryToDetectThisCompiler ( compilerCommand );
}
#if defined(WIN32)
@@ -993,7 +993,7 @@ MingwBackend::DetectBinutils ()
if ( ROS_PREFIXValue.length () > 0 )
{
binutilsPrefix = ROS_PREFIXValue;
binutilsCommand = binutilsPrefix + "ld";
binutilsCommand = binutilsPrefix + "-ld";
manualBinutilsSetting = true;
detectedBinutils = true;
}