File tree Expand file tree Collapse file tree 1 file changed +3
-3
lines changed
Expand file tree Collapse file tree 1 file changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -71,7 +71,7 @@ RUN sed -i 's/^#.*baseurl=http/baseurl=http/g' /etc/yum.repos.d/*.repo && \
7171 sed -i 's/^mirrorlist=http/#mirrorlist=http/g' /etc/yum.repos.d/*.repo
7272
7373RUN yum update -y && \
74- yum install -y devtoolset-10-gcc-* && \
74+ yum install -y devtoolset-10-gcc-*
7575RUN echo "source scl_source enable devtoolset-10" >> /etc/bashrc
7676RUN source /etc/bashrc
7777
@@ -127,7 +127,7 @@ echo 'CC=/opt/rh/devtoolset-10/root/usr/bin/gcc' >> /tmp/spc-gnu-docker.env
127127echo ' CXX=/opt/rh/devtoolset-10/root/usr/bin/g++' >> /tmp/spc-gnu-docker.env
128128echo ' AR=/opt/rh/devtoolset-10/root/usr/bin/ar' >> /tmp/spc-gnu-docker.env
129129echo ' LD=/opt/rh/devtoolset-10/root/usr/bin/ld' >> /tmp/spc-gnu-docker.env
130- echo ' SPC_DEFAULT_C_FLAGS=-fPIE' >> /tmp/spc-gnu-docker.env
130+ echo ' SPC_DEFAULT_C_FLAGS=-fPIE -fPIC ' >> /tmp/spc-gnu-docker.env
131131echo ' SPC_NO_MUSL_PATH=yes' >> /tmp/spc-gnu-docker.env
132132echo ' SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS_PROGRAM="-Wl,-O1 -pie"' >> /tmp/spc-gnu-docker.env
133133echo ' SPC_CMD_VAR_PHP_MAKE_EXTRA_LIBS="-ldl -lpthread -lm -lresolv -lutil -lrt"' >> /tmp/spc-gnu-docker.env
@@ -137,4 +137,4 @@ echo 'SPC_CMD_VAR_PHP_MAKE_EXTRA_LIBS="-ldl -lpthread -lm -lresolv -lutil -lrt"'
137137# shellcheck disable=SC2086
138138# shellcheck disable=SC2090
139139
140- $DOCKER_EXECUTABLE run --rm $INTERACT -e SPC_FIX_DEPLOY_ROOT=" $( pwd) " --env-file /tmp/spc-gnu-docker.env $MOUNT_LIST cwcc-spc-gnu-$SPC_USE_ARCH bin/spc $@
140+ $DOCKER_EXECUTABLE run --rm $INTERACT -e SPC_FIX_DEPLOY_ROOT=" $( pwd) " --env-file /tmp/spc-gnu-docker.env $MOUNT_LIST cwcc-spc-gnu-$SPC_USE_ARCH # bin/spc $@
You can’t perform that action at this time.
0 commit comments