projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release-2.140.133' into main
[feisty_meow.git]
/
scripts
/
clam
/
cpp
/
variables.def
diff --git
a/scripts/clam/cpp/variables.def
b/scripts/clam/cpp/variables.def
index 7ad4c79c1801d7d8d35ee67f4eeda1a4ba7a5827..9ab02a8702ce9832d4e8f45504a12ef22bacc647 100644
(file)
--- a/
scripts/clam/cpp/variables.def
+++ b/
scripts/clam/cpp/variables.def
@@
-919,7
+919,6
@@
ifeq "$(COMPILER)" "GNU_DARWIN"
COMPILER_ROOT_DIR = /
PLATFORM_ADD_IN = darwin
ARCHITECTURE = $(shell machine 2>/dev/null || arch 2>/dev/null || echo i686)
COMPILER_ROOT_DIR = /
PLATFORM_ADD_IN = darwin
ARCHITECTURE = $(shell machine 2>/dev/null || arch 2>/dev/null || echo i686)
-# COMPILER_FLAGS += -fgnu-runtime
export COMPILER_VERSION = $(shell $(SHELL) $(CLAM_SCRIPTS)/cpp/get_version.sh $(COMPILER) $(COMPILER_ROOT_DIR) )
export COMPILER_VERSION = $(shell $(SHELL) $(CLAM_SCRIPTS)/cpp/get_version.sh $(COMPILER) $(COMPILER_ROOT_DIR) )
@@
-955,6
+954,8
@@
ifeq "$(COMPILER)" "GNU_DARWIN"
# LOAD_FLAG_PREFIX += -Xlinker
#mac has no o3???
#-O3
# LOAD_FLAG_PREFIX += -Xlinker
#mac has no o3???
#-O3
+ # special flags for getting rid of warnings on fd_set.
+ LOAD_FLAG_PREFIX=-Wl,-U,___darwin_check_fd_set_overflow
# -Xlinker --print-map : shows what went in and why.
# -Xlinker -O3 : linker optimization
# -Xlinker --print-map : shows what went in and why.
# -Xlinker -O3 : linker optimization
@@
-976,6
+977,11
@@
ifeq "$(COMPILER)" "GNU_DARWIN"
# pthread=thread libraries.
# rt=real time libraries for shared memory.
# pthread=thread libraries.
# rt=real time libraries for shared memory.
+ # mac specific flags
+ COMPILER_FLAGS += -Wno-nullability-completeness
+#trying this one again, which had been turned off.
+ COMPILER_FLAGS += -fgnu-runtime
+
ifneq "$(DEBUG)" ""
# add in debugging flags.
# COMPILER_FLAGS += -g3 -O0
ifneq "$(DEBUG)" ""
# add in debugging flags.
# COMPILER_FLAGS += -g3 -O0