Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
V
Vim
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
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
Someone-Else
Vim
Commits
6323508e
Commit
6323508e
authored
14 years ago
by
Bram Moolenaar
Browse files
Options
Downloads
Patches
Plain Diff
Change wording in link.sh: "remove" -> "omit"
parent
4a9b19ac
Loading
Loading
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/link.sh
+7
-7
7 additions, 7 deletions
src/link.sh
with
7 additions
and
7 deletions
src/link.sh
+
7
−
7
View file @
6323508e
...
@@ -46,7 +46,7 @@ else
...
@@ -46,7 +46,7 @@ else
while
test
-n
"
$cont
"
;
do
while
test
-n
"
$cont
"
;
do
if
grep
"l
$libname
"
linkit.sh
>
/dev/null
;
then
if
grep
"l
$libname
"
linkit.sh
>
/dev/null
;
then
if
test
!
-f
link1.sed
;
then
if
test
!
-f
link1.sed
;
then
echo
"link.sh: OK, linking works, let's try
remov
ing a few libraries."
echo
"link.sh: OK, linking works, let's try
omitt
ing a few libraries."
echo
"link.sh: See auto/link.log for details."
echo
"link.sh: See auto/link.log for details."
rm
-f
auto/link.log
rm
-f
auto/link.log
fi
fi
...
@@ -55,16 +55,16 @@ else
...
@@ -55,16 +55,16 @@ else
sed
-f
link1.sed <linkit2.sh
>
linkit.sh
sed
-f
link1.sed <linkit2.sh
>
linkit.sh
# keep the last -lm
# keep the last -lm
if
test
$libname
!=
"m"
||
grep
"lm "
linkit.sh
>
/dev/null
;
then
if
test
$libname
!=
"m"
||
grep
"lm "
linkit.sh
>
/dev/null
;
then
echo
"link.sh: Trying to
remove
the
$libname
library..."
echo
"link.sh: Trying to
omit
the
$libname
library..."
cat
linkit.sh
>>
auto/link.log
cat
linkit.sh
>>
auto/link.log
# Redirect this link output, it may contain error messages which
# Redirect this link output, it may contain error messages which
# should be ignored.
# should be ignored.
if
sh linkit.sh
>>
auto/link.log 2>&1
;
then
if
sh linkit.sh
>>
auto/link.log 2>&1
;
then
echo
"link.sh:
We
don't need the
$libname
library!"
echo
"link.sh:
Vim
do
es
n't need the
$libname
library!"
cat
link1.sed
>>
auto/link.sed
cat
link1.sed
>>
auto/link.sed
rm
-f
auto/pathdef.c
rm
-f
auto/pathdef.c
else
else
echo
"link.sh:
We
DO need the
$libname
library."
echo
"link.sh:
Vim
DO
ES
need the
$libname
library."
cont
=
cont
=
cp
link.cmd linkit.sh
cp
link.cmd linkit.sh
fi
fi
...
@@ -82,7 +82,7 @@ else
...
@@ -82,7 +82,7 @@ else
$MAKE
objects/pathdef.o
$MAKE
objects/pathdef.o
fi
fi
if
test
!
-f
link1.sed
;
then
if
test
!
-f
link1.sed
;
then
echo
"link.sh: Linked fine, no libraries can be
remov
ed"
echo
"link.sh: Linked fine, no libraries can be
omitt
ed"
touch
link3.sed
touch
link3.sed
fi
fi
else
else
...
@@ -94,12 +94,12 @@ fi
...
@@ -94,12 +94,12 @@ fi
# Now do the real linking.
# Now do the real linking.
#
#
if
test
-s
auto/link.sed
;
then
if
test
-s
auto/link.sed
;
then
echo
"link.sh: Using auto/link.sed file to
remove
a few libraries"
echo
"link.sh: Using auto/link.sed file to
omit
a few libraries"
sed
-f
auto/link.sed <link.cmd
>
linkit.sh
sed
-f
auto/link.sed <link.cmd
>
linkit.sh
cat
linkit.sh
cat
linkit.sh
if
sh linkit.sh
;
then
if
sh linkit.sh
;
then
exit_value
=
0
exit_value
=
0
echo
"link.sh: Linked fine with a few libraries
remov
ed"
echo
"link.sh: Linked fine with a few libraries
omitt
ed"
else
else
exit_value
=
$?
exit_value
=
$?
echo
"link.sh: Linking failed, making auto/link.sed empty and trying again"
echo
"link.sh: Linking failed, making auto/link.sed empty and trying again"
...
...
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