D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-09-17 19:07:05 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cmake option BUILD_BC_LIBS works again.

Browse Source
This commit is contained in:
Alexey Prokhin
2010-10-31 13:38:28 +03:00
parent 4c22a76f07
commit 4ff4b442f0
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dmd2/module.c
+3 -3
View File
@@ -353,14 +353,14 @@ void Module::buildTargetFiles(bool singleObj)
if(!objfile) if(!objfile)
{ {
if (global.params.output_bc) if (global.params.output_o)
objfile = Module::buildFilePath(global.params.objname, global.params.objdir, global.obj_ext);
else if (global.params.output_bc)
objfile = Module::buildFilePath(global.params.objname, global.params.objdir, global.bc_ext); objfile = Module::buildFilePath(global.params.objname, global.params.objdir, global.bc_ext);
else if (global.params.output_ll) else if (global.params.output_ll)
objfile = Module::buildFilePath(global.params.objname, global.params.objdir, global.ll_ext); objfile = Module::buildFilePath(global.params.objname, global.params.objdir, global.ll_ext);
else if (global.params.output_s) else if (global.params.output_s)
objfile = Module::buildFilePath(global.params.objname, global.params.objdir, global.s_ext); objfile = Module::buildFilePath(global.params.objname, global.params.objdir, global.s_ext);
else
objfile = Module::buildFilePath(global.params.objname, global.params.objdir, global.obj_ext);
} }
if(doDocComment && !docfile) if(doDocComment && !docfile)
docfile = Module::buildFilePath(global.params.docname, global.params.docdir, global.doc_ext); docfile = Module::buildFilePath(global.params.docname, global.params.docdir, global.doc_ext);
runtime/CMakeLists.txt
+5 -2
View File
@@ -164,6 +164,9 @@ macro(dc INPUT_D OUTLIST_O OUTLIST_BC INCDIR MOREFLAGS PATH)
else ("${PATH}" STREQUAL "") else ("${PATH}" STREQUAL "")
file(RELATIVE_PATH output ${PATH} ${INPUT_D}) file(RELATIVE_PATH output ${PATH} ${INPUT_D})
endif ("${PATH}" STREQUAL "") endif ("${PATH}" STREQUAL "")
get_filename_component(name ${output} NAME_WE)
get_filename_component(path ${output} PATH)
set(output ${path}/${name})
set(OUTPUT_O ${PROJECT_BINARY_DIR}/${output}.o) set(OUTPUT_O ${PROJECT_BINARY_DIR}/${output}.o)
set(OUTPUT_BC ${PROJECT_BINARY_DIR}/${output}.bc) set(OUTPUT_BC ${PROJECT_BINARY_DIR}/${output}.bc)
list(APPEND ${OUTLIST_O} ${OUTPUT_O}) list(APPEND ${OUTLIST_O} ${OUTPUT_O})
@@ -173,8 +176,8 @@ macro(dc INPUT_D OUTLIST_O OUTLIST_BC INCDIR MOREFLAGS PATH)
add_custom_command( add_custom_command(
OUTPUT OUTPUT
${OUTPUT_O} ${OUTPUT_O}
#${OUTPUT_BC} ${OUTPUT_BC}
COMMAND ${LDC_LOC} -c -I${INCDIR} -I${RUNTIME_GC_DIR} ${INPUT_D} -of${OUTPUT_O} ${D_FLAGS} ${MOREFLAGS} COMMAND ${LDC_LOC} --output-o --output-bc -c -I${INCDIR} -I${RUNTIME_GC_DIR} ${INPUT_D} -of${OUTPUT_O} ${D_FLAGS} ${MOREFLAGS}
DEPENDS ${LDC_LOC} DEPENDS ${LDC_LOC}
${INPUT_D} ${INPUT_D}
${LDC_IMPORTS} ${LDC_IMPORTS}