Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
frama-c
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
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
pub
frama-c
Commits
31117906
Commit
31117906
authored
3 years ago
by
Virgile Prevosto
Committed by
Andre Maroneze
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
[ci] do not assume that 'time' binary is in /usr/bin
this is not the case in nix.
parent
0e258f5c
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
nix/default.nix
+3
-3
3 additions, 3 deletions
nix/default.nix
share/analysis-scripts/analysis.mk
+3
-2
3 additions, 2 deletions
share/analysis-scripts/analysis.mk
with
6 additions
and
5 deletions
nix/default.nix
+
3
−
3
View file @
31117906
...
...
@@ -140,9 +140,6 @@ pkgs.lib.makeExtensible
buildInputs
=
self
.
buildInputs
;
opamPackages
=
[
"headache=1.05"
];
outputs
=
[
"out"
];
postPatch
=
''
patchShebangs .
''
;
configurePhase
=
''
unset CC
autoconf
...
...
@@ -165,6 +162,9 @@ pkgs.lib.makeExtensible
opamPackages
=
self
.
build-distrib-tarball
.
opamPackages
;
src
=
self
.
build-distrib-tarball
.
out
;
outputs
=
[
"out"
];
postPatch
=
''
patchShebangs .
''
;
configurePhase
=
''
unset CC
autoconf
...
...
This diff is collapsed.
Click to expand it.
share/analysis-scripts/analysis.mk
+
3
−
2
View file @
31117906
...
...
@@ -84,9 +84,10 @@ define time_with_output
endef
endif
else
ifneq
(,$(wildcard /usr/bin/time))
TIMEBIN
:=
$(
shell which
-a
time
|
grep
'^/'
)
ifneq
(,$(TIMEBIN))
define
time_with_output
/usr/bin/time
-f
'user_time=%U\nmemory=%M'
-o
"$(1)"
$(TIMEBIN)
-f
'user_time=%U\nmemory=%M'
-o
"$(1)"
endef
else
define
time_with_output
...
...
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