diff --git a/reactos/Makefile b/reactos/Makefile index 453ea6ba60f..1dfd21ccbe6 100644 --- a/reactos/Makefile +++ b/reactos/Makefile @@ -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) diff --git a/reactos/tools/rbuild/backend/mingw/mingw.cpp b/reactos/tools/rbuild/backend/mingw/mingw.cpp index 78ccfbac411..671d9047ef1 100644 --- a/reactos/tools/rbuild/backend/mingw/mingw.cpp +++ b/reactos/tools/rbuild/backend/mingw/mingw.cpp @@ -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; }