Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
dynare
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD 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
Stéphane Adjemian
dynare
Commits
cc910224
Verified
Commit
cc910224
authored
1 year ago
by
Willi Mutschler
Browse files
Options
Downloads
Patches
Plain Diff
macOS installer: improve sed command to get GCC version
parent
6e98e984
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
macOS/build.sh
+1
-1
1 addition, 1 deletion
macOS/build.sh
macOS/deps/Makefile
+1
-1
1 addition, 1 deletion
macOS/deps/Makefile
with
2 additions
and
2 deletions
macOS/build.sh
+
1
−
1
View file @
cc910224
...
@@ -55,7 +55,7 @@ LIB64="$ROOTDIR"/macOS/deps/"$PKG_ARCH"/lib64
...
@@ -55,7 +55,7 @@ LIB64="$ROOTDIR"/macOS/deps/"$PKG_ARCH"/lib64
## - the macOS linker is different from GNU ld and does not have the equivalent of -Bstatic/-Bdynamic
## - the macOS linker is different from GNU ld and does not have the equivalent of -Bstatic/-Bdynamic
## - libgfortran.spec does not include --as-needed on macOS, hence it will link the library anyways
## - libgfortran.spec does not include --as-needed on macOS, hence it will link the library anyways
## Also, it does not seem possible to override libgfortran.spec with the --specs option.
## Also, it does not seem possible to override libgfortran.spec with the --specs option.
GCC_VERSION
=
$(
sed
-n
"
s|c = '
$(
BREWDIR
)
/bin/
gcc-
\
(
[0-9]
*
\
)
'
|
\1
|
p"
"
$ROOTDIR
"
/scripts/homebrew-native-
$PKG_ARCH
.ini
)
GCC_VERSION
=
$(
sed
-
E
n
"
/^c[[:space:]]*=/s/c[[:space:]]*=[[:space:]]*'.*
gcc-([0-9]
+
)'
/
\1
/
p"
"
$ROOTDIR
"
/scripts/homebrew-native-
"
$PKG_ARCH
"
.ini
)
QUADMATH_DIR
=
$(
mktemp
-d
)
QUADMATH_DIR
=
$(
mktemp
-d
)
ln
-s
$BREWDIR
/opt/gcc/lib/gcc/
$GCC_VERSION
/libquadmath.a
$QUADMATH_DIR
ln
-s
$BREWDIR
/opt/gcc/lib/gcc/
$GCC_VERSION
/libquadmath.a
$QUADMATH_DIR
...
...
This diff is collapsed.
Click to expand it.
macOS/deps/Makefile
+
1
−
1
View file @
cc910224
...
@@ -22,7 +22,7 @@ DEPS_ARCH ?= x86_64 # use x86_64 by default
...
@@ -22,7 +22,7 @@ DEPS_ARCH ?= x86_64 # use x86_64 by default
BREWDIR
:=
$(
if
$(
filter arm64,
$(
DEPS_ARCH
))
,/opt/homebrew,/usr/local
)
BREWDIR
:=
$(
if
$(
filter arm64,
$(
DEPS_ARCH
))
,/opt/homebrew,/usr/local
)
GCC_VERSION
=
$(
shell
sed
-n
"
s|c = '
$(
BREWDIR
)
/bin/
gcc-
\
(
[0-9]
*
\
)
'
|
\1
|
p"
../../scripts/homebrew-native-
$(
DEPS_ARCH
)
.ini
)
GCC_VERSION
=
$(
shell
sed
-
E
n
"
/^c[[:space:]]*=/s/c[[:space:]]*=[[:space:]]*'.*
gcc-([0-9]
+
)
'
/
\1
/
p"
../../scripts/homebrew-native-
$(
DEPS_ARCH
)
.ini
)
ROOT_PATH
=
$(
realpath
.
)
ROOT_PATH
=
$(
realpath
.
)
...
...
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