Skip to content

Commit

Permalink
# This is a combination of 4 commits.
Browse files Browse the repository at this point in the history
# This is the 1st commit message:

:wrench: pass CXXFLAGS to CGO_CXXFLAGS...

Signed-off-by: Rintaro Okamura <rintaro.okamura@gmail.com>

# This is the commit message #2:

:construction: wip

Signed-off-by: Rintaro Okamura <rintaro.okamura@gmail.com>

# This is the commit message #3:

:wrench: add CGO_CFLAGS, CGO_CPPFLAGS

Signed-off-by: Rintaro Okamura <rintaro.okamura@gmail.com>

# This is the commit message #4:

:wrench: use CMAKE_C_FLAGS, CMAKE_CXX_FLAGS

Signed-off-by: Rintaro Okamura <rintaro.okamura@gmail.com>
  • Loading branch information
rinx authored and actions-user committed Sep 8, 2020
1 parent 9a729a6 commit 0bee00e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,8 @@ ngt/install: /usr/local/include/NGT/Capi.h
/usr/local/include/NGT/Capi.h:
curl -LO https://github.com/yahoojapan/NGT/archive/v$(NGT_VERSION).tar.gz
tar zxf v$(NGT_VERSION).tar.gz -C /tmp
cd /tmp/NGT-$(NGT_VERSION)&& cmake .
cd /tmp/NGT-$(NGT_VERSION) && \
cmake -DCMAKE_C_FLAGS="$(CFLAGS)" -DCMAKE_CXX_FLAGS="$(CXXFLAGS)" .
make -j -C /tmp/NGT-$(NGT_VERSION)
make install -C /tmp/NGT-$(NGT_VERSION)
rm -rf v$(NGT_VERSION).tar.gz
Expand Down
1 change: 1 addition & 0 deletions dockers/agent/core/ngt/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
# limitations under the License.
#

# to build
ARG DISTROLESS_IMAGE=gcr.io/distroless/static
ARG DISTROLESS_IMAGE_TAG=nonroot
ARG UPX_OPTIONS=-9
Expand Down

0 comments on commit 0bee00e

Please sign in to comment.