Skip to content

Commit 71bfcd2

Browse files
Fix static linking and dockerfile
1 parent 3ec6114 commit 71bfcd2

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

packages/grpc-tools/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ PROJECT("grpc-tools")
33

44
SET(CMAKE_OSX_DEPLOYMENT_TARGET "11.7" CACHE STRING "Minimum OS X deployment version" FORCE)
55

6-
if(COMMAND CMAKE_POLICY)
6+
IF(COMMAND CMAKE_POLICY)
77
CMAKE_POLICY(SET CMP0003 NEW)
88
ENDIF(COMMAND CMAKE_POLICY)
99

1010
# MSVC runtime library flags are selected by an abstraction.
11-
if(COMMAND CMAKE_POLICY AND POLICY CMP0091)
11+
IF(COMMAND CMAKE_POLICY AND POLICY CMP0091)
1212
CMAKE_POLICY(SET CMP0091 NEW)
1313
ENDIF()
1414

@@ -22,8 +22,8 @@ SET(PROTOBUF_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/deps/protobuf)
2222

2323
ADD_SUBDIRECTORY(${PROTOBUF_ROOT_DIR}/cmake deps/protobuf)
2424

25-
SET(CMAKE_EXE_LINKER_FLAGS "-static-libstdc++")
26-
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-stack-protector")
25+
SET(CMAKE_EXE_LINKER_FLAGS "-static-libstdc++ -static -Wl,-Bstatic")
26+
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-stack-protector -static -Wl,-Bstatic")
2727

2828
ADD_EXECUTABLE(grpc_node_plugin
2929
src/node_generator.cc

tools/release/native/Dockerfile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# NOTE: We don't have to worry about glibc versions
2+
# because we use static linking during the
3+
# compile step.
4+
# (See packages/grpc-tools/CMakeLists.txt#L25)
5+
16
FROM ubuntu:22.04
27

38
RUN apt-get update
@@ -9,7 +14,8 @@ RUN apt-get install -y cmake curl build-essential \
914
gcc-i686-linux-gnu g++-i686-linux-gnu tar file \
1015
gcc-x86-64-linux-gnu g++-x86-64-linux-gnu binutils \
1116
gcc-aarch64-linux-gnu g++-aarch64-linux-gnu make \
12-
gcc g++ gzip bash
17+
gcc g++ gzip bash libc6-amd64-i386-cross \
18+
libc6-dev-amd64-i386-cross
1319

1420
RUN mkdir /usr/local/nvm
1521
ENV NVM_DIR /usr/local/nvm

0 commit comments

Comments
 (0)