Skip to content

Commit bab287d

Browse files
committed
depends: don't use -no_warning_for_no_symbols in macOS qt build
Not supported by llvm-ar / llvm-ranlib.
1 parent 0388dd7 commit bab287d

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

depends/packages/qt.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ $(package)_patches += no-xlib.patch
1515
$(package)_patches += fix_android_jni_static.patch
1616
$(package)_patches += dont_hardcode_pwd.patch
1717
$(package)_patches += qtbase-moc-ignore-gcc-macro.patch
18+
$(package)_patches += no_warnings_for_symbols.patch
1819
$(package)_patches += rcc_hardcode_timestamp.patch
1920
$(package)_patches += duplicate_lcqpafonts.patch
2021
$(package)_patches += guix_cross_lib_path.patch
@@ -247,6 +248,7 @@ define $(package)_preprocess_cmds
247248
patch -p1 -i $($(package)_patch_dir)/no-xlib.patch && \
248249
patch -p1 -i $($(package)_patch_dir)/qtbase-moc-ignore-gcc-macro.patch && \
249250
patch -p1 -i $($(package)_patch_dir)/memory_resource.patch && \
251+
patch -p1 -i $($(package)_patch_dir)/no_warnings_for_symbols.patch && \
250252
patch -p1 -i $($(package)_patch_dir)/rcc_hardcode_timestamp.patch && \
251253
patch -p1 -i $($(package)_patch_dir)/duplicate_lcqpafonts.patch && \
252254
patch -p1 -i $($(package)_patch_dir)/utc_from_string_no_optimize.patch && \
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- a/qtbase/mkspecs/features/mac/no_warn_empty_obj_files.prf
2+
+++ b/qtbase/mkspecs/features/mac/no_warn_empty_obj_files.prf
3+
@@ -1,7 +1,7 @@
4+
# Prevent warnings about object files without any symbols. This is a common
5+
# thing in Qt as we tend to build files unconditionally, and then use ifdefs
6+
# to compile out parts that are not relevant.
7+
-QMAKE_RANLIB += -no_warning_for_no_symbols
8+
+# QMAKE_RANLIB += -no_warning_for_no_symbols
9+
10+
# We have to tell 'ar' to not run ranlib by itself
11+
QMAKE_AR += -S

0 commit comments

Comments
 (0)