diff options
| author | Andris Zeila <andris.zeila@zabbix.com> | 2020-08-05 15:58:58 +0300 |
|---|---|---|
| committer | Andris Zeila <andris.zeila@zabbix.com> | 2020-08-05 15:59:20 +0300 |
| commit | 88332506254610fac89e887bd27868348da948e0 (patch) | |
| tree | 0c88e694ed5e67d6e08633f882de507d0deb97c3 /build | |
| parent | 37cfb1959505dce432cab05e0f515198fcef7574 (diff) | |
...G...... [ZBX-16998] improved agent binary compatibility by removing __thread attribute when not building agent2
* commit '7f7970126f09818d4567acd2d7a91ec7a0b71106':
.D........ [ZBX-16998] added changelog entry
.......... [ZBX-16998] fixed agent2 build on windows
...G...... [ZBX-16998] removed __thread usage when building only C targets
(cherry picked from commit 75ea8679f05b892a9d09c6ba5fe3ecb9b47e332f)
Diffstat (limited to 'build')
| -rw-r--r-- | build/mingw/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/build/mingw/Makefile b/build/mingw/Makefile index 972c5a8d182..dcb5fc33530 100644 --- a/build/mingw/Makefile +++ b/build/mingw/Makefile @@ -33,7 +33,9 @@ OBJS = \ $(OUTPUTDIR)\eventlog.o \ $(TARGETDIR)\resource.syso -CFLAGS := $(CFLAGS) -O2 -g -DUNICODE -DHAVE_STDINT_H=1 -I$(TOPDIR)\build\win32\include -I$(TOPDIR)\build\mingw -I$(TOPDIR)\include +CFLAGS := $(CFLAGS) -O2 -g -DUNICODE -DHAVE_STDINT_H=1 -DZBX_BUILD_AGENT2=1 -DHAVE_THREAD_LOCAL=1 \ + -I$(TOPDIR)\build\win32\include -I$(TOPDIR)\build\mingw -I$(TOPDIR)\include + RFLAGS := $(RFLAGS) --input-format=rc -O coff GOPATH := $(GOPATH);$(TOPDIR)\go TAGS := |