Donate to
e Foundation
|
Murena
handsets with /e/OS | Own a part of Murena!
Learn more
Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
A
android_build
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Insights
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
e
os
android_build
Commits
3c5191c6
Commit
3c5191c6
authored
13 years ago
by
Jean-Baptiste Queru
Committed by
android code review
13 years ago
Browse files
Options
Downloads
Plain Diff
Merge "Update build rule for executable with PRIVATE_ALL_WHOLE_STATIC_LIBRARIES"
parents
2436ea8a
61c37e7a
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
core/combo/TARGET_linux-arm.mk
+6
-0
6 additions, 0 deletions
core/combo/TARGET_linux-arm.mk
core/combo/TARGET_linux-sh.mk
+6
-0
6 additions, 0 deletions
core/combo/TARGET_linux-sh.mk
core/combo/TARGET_linux-x86.mk
+6
-0
6 additions, 0 deletions
core/combo/TARGET_linux-x86.mk
with
18 additions
and
0 deletions
core/combo/TARGET_linux-arm.mk
+
6
−
0
View file @
3c5191c6
...
...
@@ -278,6 +278,9 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -Wl,-T,$(BUILD_SYSTEM)/armelf.x \
$(
call normalize-target-libraries,
$(
PRIVATE_ALL_SHARED_LIBRARIES
))
\
$(
if
$(
filter
true
,
$(
PRIVATE_NO_CRT
))
,,
$(
TARGET_CRTBEGIN_DYNAMIC_O
))
\
$(
PRIVATE_ALL_OBJECTS
)
\
-Wl
,--whole-archive
\
$(
call normalize-target-libraries,
$(
PRIVATE_ALL_WHOLE_STATIC_LIBRARIES
))
\
-Wl
,--no-whole-archive
\
$(
if
$(
PRIVATE_GROUP_STATIC_LIBRARIES
)
,-Wl
$(
comma
)
--start-group
)
\
$(
call normalize-target-libraries,
$(
PRIVATE_ALL_STATIC_LIBRARIES
))
\
$(
if
$(
PRIVATE_GROUP_STATIC_LIBRARIES
)
,-Wl
$(
comma
)
--end-group
)
\
...
...
@@ -297,6 +300,9 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bstatic \
$(TARGET_GLOBAL_LDFLAGS)
\
$(PRIVATE_LDFLAGS)
\
$(PRIVATE_ALL_OBJECTS)
\
-Wl,--whole-archive
\
$(
call
normalize-target-libraries,
$(
PRIVATE_ALL_WHOLE_STATIC_LIBRARIES
))
\
-Wl,--no-whole-archive
\
$(
call
normalize-target-libraries,
$(
filter-out %libc_nomalloc.a,
$(
filter-out %libc.a,
$(
PRIVATE_ALL_STATIC_LIBRARIES
))))
\
-Wl,--start-group
\
$(
call
normalize-target-libraries,
$(
filter %libc.a,
$(
PRIVATE_ALL_STATIC_LIBRARIES
)))
\
...
...
This diff is collapsed.
Click to expand it.
core/combo/TARGET_linux-sh.mk
+
6
−
0
View file @
3c5191c6
...
...
@@ -153,6 +153,9 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -Wl,-T,$(BUILD_SYSTEM)/shlelf.x \
$(
call normalize-target-libraries,
$(
PRIVATE_ALL_SHARED_LIBRARIES
))
\
$(
if
$(
filter
true
,
$(
PRIVATE_NO_CRT
))
,,
$(
TARGET_CRTBEGIN_DYNAMIC_O
))
\
$(
PRIVATE_ALL_OBJECTS
)
\
-Wl
,--whole-archive
\
$(
call normalize-target-libraries,
$(
PRIVATE_ALL_WHOLE_STATIC_LIBRARIES
))
\
-Wl
,--no-whole-archive
\
$(
if
$(
PRIVATE_GROUP_STATIC_LIBRARIES
)
,-Wl
$(
comma
)
--start-group
)
\
$(
call normalize-target-libraries,
$(
PRIVATE_ALL_STATIC_LIBRARIES
))
\
$(
if
$(
PRIVATE_GROUP_STATIC_LIBRARIES
)
,-Wl
$(
comma
)
--end-group
)
\
...
...
@@ -170,6 +173,9 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bstatic -Wl,-T,$(BUILD_SYSTEM)/shlelf.x \
$(
if
$(
filter
true
,
$(
PRIVATE_NO_CRT
))
,,
$(
TARGET_CRTBEGIN_STATIC_O
))
\
$(PRIVATE_LDFLAGS)
\
$(PRIVATE_ALL_OBJECTS)
\
-Wl,--whole-archive
\
$(
call
normalize-target-libraries,
$(
PRIVATE_ALL_WHOLE_STATIC_LIBRARIES
))
\
-Wl,--no-whole-archive
\
-Wl,--start-group
\
$(
call
normalize-target-libraries,
$(
PRIVATE_ALL_STATIC_LIBRARIES
))
\
-Wl,--end-group
\
...
...
This diff is collapsed.
Click to expand it.
core/combo/TARGET_linux-x86.mk
+
6
−
0
View file @
3c5191c6
...
...
@@ -181,6 +181,9 @@ $(hide) $(PRIVATE_CXX) \
$(
call normalize-target-libraries,
$(
PRIVATE_ALL_SHARED_LIBRARIES
))
\
$(
if
$(
filter
true
,
$(
PRIVATE_NO_CRT
))
,,
$(
TARGET_CRTBEGIN_DYNAMIC_O
))
\
$(
PRIVATE_ALL_OBJECTS
)
\
-Wl
,--whole-archive
\
$(
call normalize-target-libraries,
$(
PRIVATE_ALL_WHOLE_STATIC_LIBRARIES
))
\
-Wl
,--no-whole-archive
\
$(
if
$(
PRIVATE_GROUP_STATIC_LIBRARIES
)
,-Wl
$(
comma
)
--start-group
)
\
$(
call normalize-target-libraries,
$(
PRIVATE_ALL_STATIC_LIBRARIES
))
\
$(
if
$(
PRIVATE_GROUP_STATIC_LIBRARIES
)
,-Wl
$(
comma
)
--end-group
)
\
...
...
@@ -198,6 +201,9 @@ $(hide) $(PRIVATE_CXX) \
$(
if
$(
filter
true
,
$(
PRIVATE_NO_CRT
))
,,
$(
TARGET_CRTBEGIN_STATIC_O
))
\
$(PRIVATE_LDFLAGS)
\
$(PRIVATE_ALL_OBJECTS)
\
-Wl,--whole-archive
\
$(
call
normalize-target-libraries,
$(
PRIVATE_ALL_WHOLE_STATIC_LIBRARIES
))
\
-Wl,--no-whole-archive
\
-Wl,--start-group
\
$(
call
normalize-target-libraries,
$(
PRIVATE_ALL_STATIC_LIBRARIES
))
\
$(TARGET_LIBGCC)
\
...
...
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