fix clang build error
This commit is contained in:
parent
b406d11f77
commit
9c1df02b90
@ -1,7 +1,7 @@
|
|||||||
%define debug_package %{nil}
|
%define debug_package %{nil}
|
||||||
Name: libnetwork
|
Name: libnetwork
|
||||||
Version: 0.8.0.dev.2
|
Version: 0.8.0.dev.2
|
||||||
Release: 104
|
Release: 105
|
||||||
Summary: Proxy used for docker port mapping
|
Summary: Proxy used for docker port mapping
|
||||||
License: CC-BY-SA-4.0 and MIT and Apache-2.0 and MPL-2.0
|
License: CC-BY-SA-4.0 and MIT and Apache-2.0 and MPL-2.0
|
||||||
URL: https://github.com/docker/libnetwork
|
URL: https://github.com/docker/libnetwork
|
||||||
@ -29,7 +29,11 @@ CGO_CFLAGS="-fstack-protector-strong -fPIE" \
|
|||||||
CGO_CPPFLAGS="-fstack-protector-strong -fPIE" \
|
CGO_CPPFLAGS="-fstack-protector-strong -fPIE" \
|
||||||
CGO_LDFLAGS_ALLOW='-Wl,-z,relro,-z,now' \
|
CGO_LDFLAGS_ALLOW='-Wl,-z,relro,-z,now' \
|
||||||
CGO_LDFLAGS="-Wl,-z,relro,-z,now -Wl,-z,noexecstack" \
|
CGO_LDFLAGS="-Wl,-z,relro,-z,now -Wl,-z,noexecstack" \
|
||||||
go build -buildmode=pie -ldflags="-linkmode=external -s -w -buildid=IdByIsula -extldflags=-zrelro -extldflags=-znow " -o docker-proxy ./cmd/proxy
|
%if "%toolchain" == "clang"
|
||||||
|
go build -buildmode=pie -ldflags="-linkmode=external -s -w -buildid=IdByIsula -extldflags=-Wl,-z,relro,-z,now " -o docker-proxy ./cmd/proxy
|
||||||
|
%else
|
||||||
|
go build -buildmode=pie -ldflags="-linkmode=external -s -w -buildid=IdByIsula -extldflags=-zrelro -extldflags=-znow " -o docker-proxy ./cmd/proxy
|
||||||
|
%endif
|
||||||
|
|
||||||
%install
|
%install
|
||||||
install -d $RPM_BUILD_ROOT/%{_bindir}
|
install -d $RPM_BUILD_ROOT/%{_bindir}
|
||||||
@ -42,6 +46,9 @@ install -p -m 755 libnetwork-d00ceed44cc447c77f25cdf5d59e83163bdcb4c9/docker-pro
|
|||||||
%{_bindir}/docker-proxy
|
%{_bindir}/docker-proxy
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat May 06 2023 yoo <sunyuechi@iscas.ac.cn> - 0.8.0.dev.2-105
|
||||||
|
- fix clang build error
|
||||||
|
|
||||||
* Fri May 20 2022 liukuo <liukuo@kylinos.cn> - 0.8.0.dev.2-104
|
* Fri May 20 2022 liukuo <liukuo@kylinos.cn> - 0.8.0.dev.2-104
|
||||||
- License compliance rectification
|
- License compliance rectification
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user