+magic-2

Author: erthink

ci.sh

@@ -50,7 +50,7 @@ function default_build {
 		echo "NINJA: $(which ninja 2>/dev/null) => $(ninja --version | head -1)"
 		cmake_use_ninja="-G Ninja"
 	fi
-	"${CMAKE}" ${cmake_use_ninja} "${config_args[@]+"${config_args[@]}"}" .. && "${CMAKE}" --build . "${build_args[@]+"${build_args[@]}"}"
+	"${CMAKE}" ${cmake_use_ninja} "${config_args[@]+"${config_args[@]}"}" .. --trace-expand && "${CMAKE}" --build . --verbose "${build_args[@]+"${build_args[@]}"}"
 }
 
 function default_ci {

cmake/compiler.cmake

@@ -968,9 +968,9 @@ macro(setup_compile_flags)
 
   if(CMAKE_COMPILER_IS_GNUCC AND LTO_ENABLED)
     add_compile_flags("C;CXX" ${GCC_LTO_CFLAGS})
-    set(EXE_LINKER_FLAGS "${EXE_LINKER_FLAGS} ${GCC_LTO_CFLAGS} -fverbose-asm -fwhole-program")
-    set(SHARED_LINKER_FLAGS "${SHARED_LINKER_FLAGS} ${GCC_LTO_CFLAGS} -fverbose-asm")
-    set(MODULE_LINKER_FLAGS "${MODULE_LINKER_FLAGS} ${GCC_LTO_CFLAGS} -fverbose-asm")
+    # set(EXE_LINKER_FLAGS "${EXE_LINKER_FLAGS} ${GCC_LTO_CFLAGS} -fverbose-asm -fwhole-program")
+    # set(SHARED_LINKER_FLAGS "${SHARED_LINKER_FLAGS} ${GCC_LTO_CFLAGS} -fverbose-asm")
+    # set(MODULE_LINKER_FLAGS "${MODULE_LINKER_FLAGS} ${GCC_LTO_CFLAGS} -fverbose-asm")
     if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5)
       # Pass the same optimization flags to the linker
       set(compile_flags "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}")