diff --git a/make-linux.mk b/make-linux.mk index 5ac8a7d95..77d3e0b1a 100644 --- a/make-linux.mk +++ b/make-linux.mk @@ -341,10 +341,10 @@ ifeq ($(ZT_STATIC),1) endif # For building an official semi-static binary on CentOS 7 -ifeq ($(ZT_OFFICIAL),1) - CORE_OBJS+=ext/misc/linux-old-glibc-compat.o - override LDFLAGS+=-Wl,--wrap=memcpy -static-libstdc++ -endif +#ifeq ($(ZT_OFFICIAL),1) +# CORE_OBJS+=ext/misc/linux-old-glibc-compat.o +# override LDFLAGS+=-Wl,--wrap=memcpy -static-libstdc++ +#endif ifeq ($(ZT_CONTROLLER),1) override CXXFLAGS+=-Wall -Wno-deprecated -std=c++17 -pthread $(INCLUDES) -DNDEBUG $(DEFS) diff --git a/zerotier-one.spec b/zerotier-one.spec index 2ef6c1dbe..ffb010c24 100644 --- a/zerotier-one.spec +++ b/zerotier-one.spec @@ -102,7 +102,7 @@ ln -s %{getenv:PWD} %{name}-%{version} mkdir -p SOURCES tar --exclude=%{name}-%{version}/.git --exclude=%{name}-%{version}/%{name}-%{version} -czf SOURCES/%{name}-%{version}.tar.gz %{name}-%{version}/* rm -f %{name}-%{version} -# cp -a %{getenv:PWD}/* . +cp -a %{getenv:PWD}/* . %endif %build