Skip to content

Commit

Permalink
remove some compiling options for MacOS
Browse files Browse the repository at this point in the history
  • Loading branch information
zhengshuxin committed Apr 11, 2022
1 parent 36e21cc commit d9f0c8b
Show file tree
Hide file tree
Showing 59 changed files with 87 additions and 64 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ endif

# For Darwin
ifeq ($(findstring Darwin, $(OSNAME)), Darwin)
CC += -arch x86_64 -arch arm64
# CC += -arch x86_64 -arch arm64
RPATH = macos
SYSLIB += -rdynamic -L/usr/lib -liconv
LDFLAGS = -dynamiclib -shared
Expand Down
2 changes: 1 addition & 1 deletion app/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ endif

# For Darwin
ifeq ($(findstring Darwin, $(UNIXNAME)), Darwin)
CC += -arch x86_64 -arch arm64
# CC += -arch x86_64 -arch arm64
CFLAGS += -DMACOSX -Wno-invalid-source-encoding \
-Wno-invalid-offsetof
UNIXTYPE = MACOSX
Expand Down
2 changes: 1 addition & 1 deletion app/gson/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ endif

# For Darwin
ifeq ($(findstring Darwin, $(UNIXNAME)), Darwin)
CC += -arch x86_64 -arch arm64
# CC += -arch x86_64 -arch arm64
CFLAGS += -DMACOSX -Wno-invalid-source-encoding \
-Wno-invalid-offsetof
UNIXTYPE = MACOSX
Expand Down
2 changes: 1 addition & 1 deletion app/gson/demo/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ endif

# For Darwin
ifeq ($(findstring Darwin, $(UNIXNAME)), Darwin)
CC += -arch x86_64 -arch arm64
# CC += -arch x86_64 -arch arm64
CFLAGS += -DMACOSX -Wno-invalid-source-encoding \
-Wno-invalid-offsetof
UNIXTYPE = MACOSX
Expand Down
2 changes: 1 addition & 1 deletion app/gson/test/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ endif

# For Darwin
ifeq ($(findstring Darwin, $(UNIXNAME)), Darwin)
CC += -arch x86_64 -arch arm64
# CC += -arch x86_64 -arch arm64
CFLAGS += -DMACOSX -Wno-invalid-source-encoding \
-Wno-invalid-offsetof
UNIXTYPE = MACOSX
Expand Down
2 changes: 1 addition & 1 deletion app/master/daemon/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ endif

# For Darwin
ifeq ($(findstring Darwin, $(OSNAME)), Darwin)
CC += -arch x86_64 -arch arm64
# CC += -arch x86_64 -arch arm64
CFLAGS += -DMACOSX -Wno-invalid-source-encoding \
-Wno-invalid-offsetof
UNIXTYPE = MACOSX
Expand Down
2 changes: 1 addition & 1 deletion app/master/tools/lib_global/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ endif

# For Darwin
ifeq ($(findstring Darwin, $(UNIXNAME)), Darwin)
CC += -arch x86_64 -arch arm64
# CC += -arch x86_64 -arch arm64
CFLAGS += -DMACOSX -Wno-invalid-source-encoding \
-Wno-invalid-offsetof -fPIC -Werror \
-Wno-unused-private-field
Expand Down
2 changes: 1 addition & 1 deletion app/master/tools/lib_global/test/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ endif

# For Darwin
ifeq ($(findstring Darwin, $(OSNAME)), Darwin)
CC += -arch x86_64 -arch arm64
# CC += -arch x86_64 -arch arm64
CFLAGS += -DMACOSX -Wno-invalid-source-encoding \
-Wno-invalid-offsetof
UNIXTYPE = MACOSX
Expand Down
2 changes: 1 addition & 1 deletion app/master/tools/master_ctl/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ endif

# For Darwin
ifeq ($(findstring Darwin, $(OSNAME)), Darwin)
CC += -arch x86_64 -arch arm64
# CC += -arch x86_64 -arch arm64
CFLAGS += -DMACOSX -Wno-invalid-source-encoding \
-Wno-invalid-offsetof
UNIXTYPE = MACOSX
Expand Down
2 changes: 1 addition & 1 deletion app/master/tools/master_ctld/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ endif

# For Darwin
ifeq ($(findstring Darwin, $(OSNAME)), Darwin)
CC += -arch x86_64 -arch arm64
# CC += -arch x86_64 -arch arm64
CFLAGS += -DMACOSX -Wno-invalid-source-encoding \
-Wno-invalid-offsetof
UNIXTYPE = MACOSX
Expand Down
2 changes: 1 addition & 1 deletion app/master/tools/master_dispatch/www/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ endif

# For Darwin
ifeq ($(findstring Darwin, $(UNIXNAME)), Darwin)
CC += -arch x86_64 -arch arm64
# CC += -arch x86_64 -arch arm64
CFLAGS += -DMACOSX -Wno-invalid-source-encoding \
-Wno-invalid-offsetof
UNIXTYPE = MACOSX
Expand Down
2 changes: 1 addition & 1 deletion app/master/tools/master_guard/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ endif

# For Darwin
ifeq ($(findstring Darwin, $(OSNAME)), Darwin)
CC += -arch x86_64 -arch arm64
# CC += -arch x86_64 -arch arm64
CFLAGS += -DMACOSX -Wno-invalid-source-encoding \
-Wno-invalid-offsetof
UNIXTYPE = MACOSX
Expand Down
2 changes: 1 addition & 1 deletion app/master/tools/master_monitor/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ endif

# For Darwin
ifeq ($(findstring Darwin, $(OSNAME)), Darwin)
CC += -arch x86_64 -arch arm64
# CC += -arch x86_64 -arch arm64
CFLAGS += -DMACOSX -Wno-invalid-source-encoding \
-Wno-invalid-offsetof
UNIXTYPE = MACOSX
Expand Down
2 changes: 1 addition & 1 deletion app/master/tools/service_guard/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ endif

# For Darwin
ifeq ($(findstring Darwin, $(OSNAME)), Darwin)
CC += -arch x86_64 -arch arm64
# CC += -arch x86_64 -arch arm64
CFLAGS += -DMACOSX -Wno-invalid-source-encoding \
-Wno-invalid-offsetof
UNIXTYPE = MACOSX
Expand Down
2 changes: 1 addition & 1 deletion app/redis_tools/redis_builder/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ endif

# For Darwin
ifeq ($(findstring Darwin, $(UNIXNAME)), Darwin)
CC += -arch x86_64 -arch arm64
# CC += -arch x86_64 -arch arm64
CFLAGS += -DMACOSX -Wno-invalid-source-encoding \
-Wno-invalid-offsetof
UNIXTYPE = MACOSX
Expand Down
2 changes: 1 addition & 1 deletion app/wizard/tmpl/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ endif

# For Darwin
ifeq ($(findstring Darwin, $(UNIXNAME)), Darwin)
CC += -arch x86_64 -arch arm64
# CC += -arch x86_64 -arch arm64
CFLAGS += -DMACOSX -Wno-invalid-source-encoding \
-Wno-invalid-offsetof
UNIXTYPE = MACOSX
Expand Down
2 changes: 1 addition & 1 deletion app/wizard/tmpl/Makefile_fiber.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ endif

# For Darwin
ifeq ($(findstring Darwin, $(UNIXNAME)), Darwin)
CC += -arch x86_64 -arch arm64
# CC += -arch x86_64 -arch arm64
CFLAGS += -DMACOSX -Wno-invalid-source-encoding \
-Wno-invalid-offsetof
UNIXTYPE = MACOSX
Expand Down
2 changes: 1 addition & 1 deletion app/wizard_demo/fiber_chat/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ endif

# For Darwin
ifeq ($(findstring Darwin, $(UNIXNAME)), Darwin)
CC += -arch x86_64 -arch arm64
# CC += -arch x86_64 -arch arm64
CFLAGS += -DMACOSX -Wno-invalid-source-encoding \
-Wno-invalid-offsetof
UNIXTYPE = MACOSX
Expand Down
2 changes: 1 addition & 1 deletion app/wizard_demo/ht/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ endif

# For Darwin
ifeq ($(findstring Darwin, $(UNIXNAME)), Darwin)
CC += -arch x86_64 -arch arm64
# CC += -arch x86_64 -arch arm64
CFLAGS += -DMACOSX -Wno-invalid-source-encoding \
-Wno-invalid-offsetof
UNIXTYPE = MACOSX
Expand Down
2 changes: 1 addition & 1 deletion app/wizard_demo/httpd_download/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ endif

# For Darwin
ifeq ($(findstring Darwin, $(UNIXNAME)), Darwin)
CC += -arch x86_64 -arch arm64
# CC += -arch x86_64 -arch arm64
CFLAGS += -DMACOSX -Wno-invalid-source-encoding \
-Wno-invalid-offsetof
UNIXTYPE = MACOSX
Expand Down
2 changes: 1 addition & 1 deletion app/wizard_demo/httpd_fiber_upload/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ endif

# For Darwin
ifeq ($(findstring Darwin, $(UNIXNAME)), Darwin)
CC += -arch x86_64 -arch arm64
# CC += -arch x86_64 -arch arm64
CFLAGS += -DMACOSX -Wno-invalid-source-encoding \
-Wno-invalid-offsetof
UNIXTYPE = MACOSX
Expand Down
2 changes: 1 addition & 1 deletion app/wizard_demo/httpd_proxy/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ endif

# For Darwin
ifeq ($(findstring Darwin, $(UNIXNAME)), Darwin)
CC += -arch x86_64 -arch arm64
# CC += -arch x86_64 -arch arm64
CFLAGS += -DMACOSX -Wno-invalid-source-encoding \
-Wno-invalid-offsetof
UNIXTYPE = MACOSX
Expand Down
2 changes: 1 addition & 1 deletion app/wizard_demo/httpd_upload/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ endif

# For Darwin
ifeq ($(findstring Darwin, $(UNIXNAME)), Darwin)
CC += -arch x86_64 -arch arm64
# CC += -arch x86_64 -arch arm64
CFLAGS += -DMACOSX -Wno-invalid-source-encoding \
-Wno-invalid-offsetof
UNIXTYPE = MACOSX
Expand Down
2 changes: 1 addition & 1 deletion app/wizard_demo/qrserver/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ endif

# For Darwin
ifeq ($(findstring Darwin, $(UNIXNAME)), Darwin)
CC += -arch x86_64 -arch arm64
# CC += -arch x86_64 -arch arm64
CFLAGS += -DMACOSX -Wno-invalid-source-encoding \
-Wno-invalid-offsetof
UNIXTYPE = MACOSX
Expand Down
2 changes: 1 addition & 1 deletion lib_acl/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ endif

# For Darwin
ifeq ($(findstring Darwin, $(UNIXNAME)), Darwin)
CC += -arch x86_64 -arch arm64
# CC += -arch x86_64 -arch arm64
CFLAGS += -Wno-invalid-source-encoding \
-Wno-invalid-offsetof \
-ffunction-sections \
Expand Down
2 changes: 1 addition & 1 deletion lib_acl/samples/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ endif

# For Darwin
ifeq ($(findstring Darwin, $(UNIXNAME)), Darwin)
CC += -arch x86_64 -arch arm64
# CC += -arch x86_64 -arch arm64
CFLAGS += -DMACOSX -Wno-invalid-source-encoding \
-Wno-invalid-offsetof
SYSLIB += -rdynamic
Expand Down
4 changes: 2 additions & 2 deletions lib_acl/samples/Makefile_cpp.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ endif

# For Darwin
ifeq ($(findstring Darwin, $(UNIXNAME)), Darwin)
CC += -arch x86_64 -arch arm64
# CC += -arch x86_64 -arch arm64
CFLAGS += -DMACOSX -Wno-invalid-source-encoding \
-Wno-invalid-offsetof
UNIXTYPE = MACOSX
Expand Down Expand Up @@ -97,7 +97,7 @@ endif

# For Darwin
ifeq ($(findstring Darwin, $(UNIXNAME)), Darwin)
CC += -arch x86_64 -arch arm64
# CC += -arch x86_64 -arch arm64
CFLAGS += -DMACOSX
endif

Expand Down
2 changes: 1 addition & 1 deletion lib_acl/samples/aio/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ endif

# For Darwin
ifeq ($(findstring Darwin, $(UNIXNAME)), Darwin)
CC += -arch x86_64 -arch arm64
# CC += -arch x86_64 -arch arm64
CFLAGS += -DMACOSX
endif

Expand Down
2 changes: 1 addition & 1 deletion lib_acl/samples/master/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ endif

# For Darwin
ifeq ($(findstring Darwin, $(UNIXNAME)), Darwin)
CC += -arch x86_64 -arch arm64
# CC += -arch x86_64 -arch arm64
CFLAGS += -DMACOSX
endif

Expand Down
2 changes: 1 addition & 1 deletion lib_acl/samples/thread/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ endif

# For Darwin
ifeq ($(findstring Darwin, $(UNIXNAME)), Darwin)
CC += -arch x86_64 -arch arm64
# CC += -arch x86_64 -arch arm64
CFLAGS += -DMACOSX
endif

Expand Down
2 changes: 1 addition & 1 deletion lib_acl/samples/thread/Makefile_cpp.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ endif

# For Darwin
ifeq ($(findstring Darwin, $(UNIXNAME)), Darwin)
CC += -arch x86_64 -arch arm64
# CC += -arch x86_64 -arch arm64
CFLAGS += -DMACOSX
endif

Expand Down
4 changes: 2 additions & 2 deletions lib_acl/samples/udp/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ endif

# For Darwin
ifeq ($(findstring Darwin, $(UNIXNAME)), Darwin)
CC += -arch x86_64 -arch arm64
# CC += -arch x86_64 -arch arm64
CFLAGS += -DMACOSX -Wno-invalid-source-encoding \
-Wno-invalid-offsetof
UNIXTYPE = MACOSX
Expand Down Expand Up @@ -97,7 +97,7 @@ endif

# For Darwin
ifeq ($(findstring Darwin, $(UNIXNAME)), Darwin)
CC += -arch x86_64 -arch arm64
# CC += -arch x86_64 -arch arm64
CFLAGS += -DMACOSX
endif

Expand Down
2 changes: 1 addition & 1 deletion lib_acl/samples/vstream_popen2/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ endif

# For Darwin
ifeq ($(findstring Darwin, $(UNIXNAME)), Darwin)
CC += -arch x86_64 -arch arm64
# CC += -arch x86_64 -arch arm64
CFLAGS += -D_REENTRANT -pedantic -DMACOSX
SYSLIB = -lpthread
endif
Expand Down
2 changes: 1 addition & 1 deletion lib_acl/samples/vstream_popen3/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ endif

# For Darwin
ifeq ($(findstring Darwin, $(UNIXNAME)), Darwin)
CC += -arch x86_64 -arch arm64
# CC += -arch x86_64 -arch arm64
CFLAGS += -D_REENTRANT -pedantic -DMACOSX
SYSLIB = -lpthread
endif
Expand Down
4 changes: 2 additions & 2 deletions lib_acl/samples/xml/xml5/Makefile_cpp.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ endif

# For Darwin
ifeq ($(findstring Darwin, $(UNIXNAME)), Darwin)
CC += -arch x86_64 -arch arm64
# CC += -arch x86_64 -arch arm64
CFLAGS += -DMACOSX -Wno-invalid-source-encoding \
-Wno-invalid-offsetof
UNIXTYPE = MACOSX
Expand Down Expand Up @@ -84,7 +84,7 @@ endif

# For Darwin
ifeq ($(findstring Darwin, $(UNIXNAME)), Darwin)
CC += -arch x86_64 -arch arm64
# CC += -arch x86_64 -arch arm64
CFLAGS += -DMACOSX
endif

Expand Down
2 changes: 1 addition & 1 deletion lib_acl_cpp/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ endif

# For Darwin
ifeq ($(findstring Darwin, $(UNIXNAME)), Darwin)
CC += -arch x86_64 -arch arm64
# CC += -arch x86_64 -arch arm64
CFLAGS += -Wno-invalid-source-encoding \
-Wno-invalid-offsetof \
-Wno-unused-private-field \
Expand Down
2 changes: 1 addition & 1 deletion lib_acl_cpp/samples-c++1x/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ endif

# For Darwin
ifeq ($(findstring Darwin, $(UNIXNAME)), Darwin)
CC += -arch x86_64 -arch arm64
# CC += -arch x86_64 -arch arm64
CFLAGS += -DMACOSX -Wno-invalid-source-encoding \
-Wno-invalid-offsetof
SYSLIB += -rdynamic
Expand Down
2 changes: 1 addition & 1 deletion lib_acl_cpp/samples/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ endif

# For Darwin
ifeq ($(findstring Darwin, $(UNIXNAME)), Darwin)
CC += -arch x86_64 -arch arm64
# CC += -arch x86_64 -arch arm64
CFLAGS += -DMACOSX -Wno-invalid-source-encoding \
-Wno-invalid-offsetof
SYSLIB += -liconv -rdynamic
Expand Down
2 changes: 1 addition & 1 deletion lib_dict/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ endif

# For Darwin
ifeq ($(findstring Darwin, $(UNIXNAME)), Darwin)
CC += -arch x86_64 -arch arm64
# CC += -arch x86_64 -arch arm64
CFLAGS += -DMACOSX
UNIXTYPE = MACOSX
endif
Expand Down
2 changes: 1 addition & 1 deletion lib_dict/test/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ endif

# For Darwin
ifeq ($(findstring Darwin, $(UNIXNAME)), Darwin)
CC += -arch x86_64 -arch arm64
# CC += -arch x86_64 -arch arm64
CFLAGS += -DMACOSX -D_REENTRANT
SYSLIB = -lpthread
endif
Expand Down
2 changes: 1 addition & 1 deletion lib_fiber/c.old/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ endif

# For Darwin
ifeq ($(findstring Darwin, $(UNIXNAME)), Darwin)
CC += -arch x86_64 -arch arm64
# CC += -arch x86_64 -arch arm64
CFLAGS += -DMACOSX -Wno-invalid-source-encoding \
-Wno-invalid-offsetof
UNIXTYPE = MACOSX
Expand Down
Loading

0 comments on commit d9f0c8b

Please sign in to comment.