Mercurial > projects > ldc

changeset 866:cd87b3f15ccf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automated merge with http://hg.dsource.org/projects/ldc
author Christian Kamm <kamm incasoftware de>
date Sat, 20 Dec 2008 09:15:46 +0100
parents 6c850977a941 (diff) 5e5873d847f6 (current diff)
children 766267808f11
files
diffstat 2 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/gen/linker.cpp	Sat Dec 20 09:15:31 2008 +0100
+++ b/gen/linker.cpp	Sat Dec 20 09:15:46 2008 +0100
@@ -72,7 +72,7 @@
         else
             exestr = "a.out";
     }
-    if (global.params.os == OSWindows)
+    if (global.params.os == OSWindows && !(exestr.substr(exestr.length()-4) == ".exe"))
         exestr.append(".exe");
 
     std::string outopt = "-o=" + exestr;
@@ -240,7 +240,7 @@
         else
             exestr = "a.out";
     }
-    if (global.params.os == OSWindows)
+    if (global.params.os == OSWindows && !(exestr.rfind(".exe") == exestr.length()-4))
         exestr.append(".exe");
 
     args.push_back("-o");
--- a/runtime/CMakeLists.txt	Sat Dec 20 09:15:31 2008 +0100
+++ b/runtime/CMakeLists.txt	Sat Dec 20 09:15:46 2008 +0100
@@ -31,9 +31,10 @@
 	# copy imports to runtime dir
 	add_custom_command(
 		OUTPUT ldc-imports
-		COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_SOURCE_DIR}/import/ldc ${RUNTIME_DIR}/ldc
-		COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/internal/ldc/bitmanip.d ${RUNTIME_DIR}/ldc
-		COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/internal/ldc/vararg.d ${RUNTIME_DIR}/ldc
+		COMMAND ${CMAKE_COMMAND} -E copy_if_different ${PROJECT_SOURCE_DIR}/import/ldc/cstdarg.di ${RUNTIME_DIR}/ldc/cstdarg.di
+		COMMAND ${CMAKE_COMMAND} -E copy_if_different ${PROJECT_SOURCE_DIR}/import/ldc/intrinsics.di ${RUNTIME_DIR}/ldc/intrinsics.di
+		COMMAND ${CMAKE_COMMAND} -E copy_if_different ${PROJECT_SOURCE_DIR}/internal/ldc/bitmanip.d ${RUNTIME_DIR}/ldc/bitmanip.d
+		COMMAND ${CMAKE_COMMAND} -E copy_if_different ${PROJECT_SOURCE_DIR}/internal/ldc/vararg.d ${RUNTIME_DIR}/ldc/vararg.d
 	)
 	set(LDC_IMPORTS ldc-imports)
 	# library names
@@ -110,7 +111,7 @@
 			${OUTPUT_O}
 			${OUTPUT_BC}
 		COMMAND ${LDC_LOC} -c -I${INCDIR} -output-bc ${INPUT_D} -of${OUTPUT_O} ${D_FLAGS} ${MOREFLAGS}
-		DEPENDS ${LDC_LOC}
+		DEPENDS ${LDC_LOC} ${LDC_IMPORTS}
 	)
 endmacro(dc)