From 69033876c6b13e964f344ce8351a5a6a1faf1df4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20S=C3=B8rvig?= Date: Fri, 7 Oct 2022 09:53:00 +0200 Subject: wasm: use standard clang optimization options These were mostly identical. Use the base clang config and then specialize for Emscripten in a separate section. Behavior changes: QT_CFLAGS_OPTIMIZE_SIZE is now -Oz instead of -Os. Emscripten does not allow -Og, replace that flag with -O2 -g. Change-Id: I08163551ad6b84377b99f287983cc1191521055c Reviewed-by: Aleksandr Reviakin Reviewed-by: David Skoland --- cmake/QtCompilerOptimization.cmake | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'cmake') diff --git a/cmake/QtCompilerOptimization.cmake b/cmake/QtCompilerOptimization.cmake index 8715f7f84b..b5b49ab78a 100644 --- a/cmake/QtCompilerOptimization.cmake +++ b/cmake/QtCompilerOptimization.cmake @@ -73,7 +73,7 @@ endif() # TODO: Missing mkspecs flags we don't handle below: win32-clang-g++, win32-clang-msvc, rtems-base # # gcc and clang base -if(GCC OR CLANG AND NOT WASM) +if(GCC OR CLANG) set(QT_CFLAGS_OPTIMIZE "-O2") set(QT_CFLAGS_OPTIMIZE_FULL "-O3") set(QT_CFLAGS_OPTIMIZE_DEBUG "-Og") @@ -121,12 +121,8 @@ if (QCC) set(QT_CFLAGS_OPTIMIZE_FULL "-O3") endif() +# Emscripten Clang if(WASM) - set(QT_CFLAGS_OPTIMIZE "-O2") - set(QT_CFLAGS_OPTIMIZE_FULL "-O3") - set(QT_CFLAGS_OPTIMIZE_SIZE "-Os") - set(QT_CFLAGS_OPTIMIZE_DEBUG "-g2") - + set(QT_CFLAGS_OPTIMIZE_DEBUG "-O2 -g") # -Og is not supported set(QT_CFLAGS_SSE2 -O2 -msimd128 -msse -msse2) - endif() -- cgit v1.2.3