From 7393a02b74d77c3e854f24e561a1c45600b09d15 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Fri, 5 Nov 2010 23:17:29 +0000 Subject: [PATCH] [CMAKE] - Explicitly disable auto imports for executables. - Set a proper linker invocation for C++ modules. svn path=/branches/cmake-bringup/; revision=49503 --- gcc.cmake | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gcc.cmake b/gcc.cmake index 4be1057f50d..4811071e4b6 100644 --- a/gcc.cmake +++ b/gcc.cmake @@ -1,24 +1,22 @@ - if(NOT CMAKE_CROSSCOMPILING) add_definitions(-fshort-wchar) - else() # Linking link_directories("${REACTOS_SOURCE_DIR}/importlibs" ${REACTOS_BINARY_DIR}/lib/3rdparty/mingw) set(CMAKE_C_LINK_EXECUTABLE " -o ") set(CMAKE_CXX_LINK_EXECUTABLE " -o ") -set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--kill-at") +set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--kill-at -Wl,--disable-auto-import") # -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds # Compiler Core add_definitions(-pipe -fms-extensions) set(CMAKE_C_CREATE_SHARED_LIBRARY " -o ") - +set(CMAKE_CXX_CREATE_SHARED_LIBRARY " -o ") set(CMAKE_RC_CREATE_SHARED_LIBRARY " -o ") # Debugging (Note: DWARF-4 on 4.5.1 when we ship)