Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
ShellB3
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Ray Garcia
ShellB3
Commits
9ab74ff1
Commit
9ab74ff1
authored
4 months ago
by
Ray Garcia
Browse files
Options
Downloads
Patches
Plain Diff
possible fix for obscure GCC build error
parent
37b346e5
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Dockerfile
+3
-1
3 additions, 1 deletion
Dockerfile
ShellB3/shallbethree.sh
+5
-1
5 additions, 1 deletion
ShellB3/shallbethree.sh
with
8 additions
and
2 deletions
Dockerfile
+
3
−
1
View file @
9ab74ff1
...
...
@@ -13,10 +13,12 @@ ENV REVNUM=$REVNUM
ARG
PYTHON_VERSION=39
ARG
TRIM=cspp
ENV
PORTABLESHELLB3=true
ENV
MAKEFLAGS=-j40
FROM
setup
as
compiler
ENV
MAKEFLAGS=-j8
RUN
./shallbethree.sh mk_gcc12
ENV
MAKEFLAGS=-j16
ARG
LINUXCPUFLAGS="-march=ivybridge -fPIC"
ENV
LINUXCPUFLAGS="${LINUXCPUFLAGS}"
# numcodecs will break on avx2 build when ivybridge arch is forced
...
...
This diff is collapsed.
Click to expand it.
ShellB3/shallbethree.sh
+
5
−
1
View file @
9ab74ff1
...
...
@@ -7247,7 +7247,11 @@ mk__gcc() {
NAMESRCPATH="gcc src/sys/gcc-${GCCVER}.tar.* gcc-${GCCVER}"
fi
CXXFLAGS="$(omitparameter -stdlib=libc++ 0 ${CXXFLAGS})" CPPFLAGS="$(omitparameter -stdlib=libc++ 0 ${CPPFLAGS}) $( isDarwin && echo -DHAVE_FCNTL_H=1 -DHAVE_SPAWN_H=1)" \
# https://github.com/riscv-collab/riscv-gnu-toolchain/issues/860
unset LIBRARY_PATH
export LD_LIBRARY_PATH="$BASE/lib:$BASE/lib64:$LD_LIBRARY_PATH"
CXXFLAGS="$(omitparameter -stdlib=libc++ 0 ${CXXFLAGS})" CPPFLAGS="$(omitparameter -stdlib=libc++ 0 ${CPPFLAGS}) $( isDarwin && echo -DHAVE_FCNTL_H=1 -DHAVE_SPAWN_H=1)" \
_configure_make_install ${NAMESRCPATH} --with-gmp=${BASE} --with-mpfr=${BASE} \
--with-mpc=${BASE} --bindir=${BASE}/sysbin --disable-libgcj --with-isl=${BASE} --enable-checking=release \
--disable-multilib --enable-languages=${LANGS} ${EXTRAPARMS} "$@"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment