Skip to content

Commit 4278d66

Browse files
committed
Initial changes to support parallel make with bcc64x
1 parent b085809 commit 4278d66

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

templates/bmake.mpd

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ EXEFLAGS = <%exeflags%>
4242
LINKER_DLL_ARGUMENTS = <%linker_dll_arguments%>
4343
LINKER_EXE_ARGUMENTS = <%linker_exe_arguments%>
4444
DEBUG_EXT = <%debug_ext%>
45+
<%if(parallel_flags)%>PARALLEL_CFLAGS = <%parallel_flags%><%endif%>
4546
!else
4647
<%endfor%>
4748
!error You must select one of these compilers:<%foreach(compilers)%> <%normalize(uc(compiler))%><%endfor%>
@@ -98,6 +99,8 @@ RC = <%rc%>
9899
LIBFLAGS = <%libflags%>
99100
CCFLAGS = $(CC_CFLAGS)<%if(type_is_binary)%> $(BINARY_FLAGS)<%endif%><%if(compile_flags)%> <%compile_flags%><%endif%>
100101

102+
.nosilent
103+
101104
<%if(use_vcl)%>
102105
STARTUP_LETTER = <%if(exename)%>w<%else%><%startup_letter%><%endif%>
103106
<%else%>
@@ -314,10 +317,18 @@ generated: $(GENERATED_DIRTY)
314317

315318
.path$(OBJ_EXT) = $(INTERMEDIATE)
316319

320+
!ifdef PARALLEL_CFLAGS
321+
.path.cpp = $(CPPDIR)
322+
.cpp$(OBJ_EXT):
323+
if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
324+
$(CC) $(PARALLEL_CFLAGS) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARN_FLAGS) -output-dir $(@D) -c {$? }
325+
326+
!else
317327
.path.cpp = $(CPPDIR)
318328
.cpp$(OBJ_EXT):
319329
@if not exist "$(INTERMEDIATE)" mkdir "$(INTERMEDIATE)"
320330
$(CC) $(DYN_FLAGS) $(STATIC_FLAGS) $(OCFLAGS) $(CG_CFLAGS) $(UC_CFLAGS) $(THREAD_FLAGS) $(CCFLAGS) $(CFLAGS) $(WARN_FLAGS) -c -o $(@D)\$(@F) $<
331+
!endif
321332

322333
.path.cxx = $(CPPDIR)
323334
.cxx$(OBJ_EXT):

templates/bmakecommon.mpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,4 +140,5 @@ exeflags = -tR
140140
object_search_path = 0
141141
linker_dll_arguments = $(DLLFLAGS) $(UC_LFLAGS) $(LFLAGS:\=/) $(OBJFILES:\=/) -o $(OUTPUTDIR:\=/)$(NAME)$(DLL_EXT) -Xlinker --out-implib -Xlinker $(OUTPUTDIR:\=/)$(NAME).lib $(LIBFILES:\=/) $(RESOURCE:\=/)
142142
linker_exe_arguments = $(EXEFLAGS) $(UC_LFLAGS) $(LFLAGS:\=/) $(OBJFILES:\=/) -o $(OUTPUTDIR:\=/)$(NAME)$(EXE_EXT) $(LIBFILES:\=/) $(RESOURCE:\=/)
143+
parallel_flags = --jobs=0
143144
}

0 commit comments

Comments
 (0)