Skip to content

Commit

Permalink
Link with static libstdc++
Browse files Browse the repository at this point in the history
  • Loading branch information
rafie committed Aug 22, 2023
1 parent 5183395 commit 6007c0e
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 3 deletions.
6 changes: 4 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -823,11 +823,13 @@ workflows:
name: build
<<: *not-on-integ-branch
- build-platforms:
<<: *on-integ-and-version-tags
#@@<<: *on-integ-and-version-tags
<<: *always
context: common
matrix:
parameters:
platform: [bullseye, jammy, focal, bionic, centos7, rocky8, amzn2]
#@@platform: [bullseye, jammy, focal, bionic, centos7, rocky8, amzn2]
platform: [centos7]
- build-arm-platforms:
<<: *on-integ-and-version-tags
context: common
Expand Down
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ LIBS=$(RAX) $(LIBXXHASH) $(GRAPHBLAS) $(REDISEARCH_LIBS) $(LIBCYPHER_PARSER) $(U
CC_COMMON_H=$(SRCDIR)/src/common.h

CC_C_STD=gnu11
CC_STATIC_LIBSTDCXX ?= 1
CC_OPENMP=1

include $(MK)/defs
Expand Down
3 changes: 3 additions & 0 deletions build/docker/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,6 @@ XENIAL_MODERN_OMP ?= 0
DOCKER_VARS += XENIAL_MODERN_OMP

include $(MK)/module.docker.rules

verify:
$(SHOW)DOCKER="$(DEFAULT_TAG)" $(ROOT)/sbin/verify-docker
20 changes: 20 additions & 0 deletions sbin/verify-docker
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#!/bin/bash

PROGNAME="${BASH_SOURCE[0]}"
HERE="$(cd "$(dirname "$PROGNAME")" &>/dev/null && pwd)"
ROOT=$(cd $HERE/.. && pwd)
READIES=$ROOT/deps/readies
. $READIES/shibumi/defs

echo "Verifying $DOCKER:"
errfile=$(mktemp /tmp/verify-docker.err.XXXXX)
if DOCKER="$DOCKER" $READIES/bin/redis-cmd -- ft.config get timeout 2> $errfile | grep TIMEOUT > /dev/null; then
echo "OK"
E=0
else
eprint "There are errors:"
>&2 cat $errfile
E=1
fi
rm -f $errfile
exit $E

0 comments on commit 6007c0e

Please sign in to comment.