Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
T
tarantool
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
core
tarantool
Commits
f0d9ee2e
Commit
f0d9ee2e
authored
8 years ago
by
Nick Zavaritsky
Browse files
Options
Downloads
Patches
Plain Diff
Move exports to extra, update gitignore
parent
a96d7926
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitignore
+1
-0
1 addition, 0 deletions
.gitignore
extra/exports
+0
-0
0 additions, 0 deletions
extra/exports
src/CMakeLists.txt
+10
-9
10 additions, 9 deletions
src/CMakeLists.txt
with
11 additions
and
9 deletions
.gitignore
+
1
−
0
View file @
f0d9ee2e
...
...
@@ -50,6 +50,7 @@ extra/dist/tarantool.logrotate
extra/dist/tarantool@.service
extra/dist/tarantool.tmpfiles.conf
extra/dist/tarantool-generator
extra/exports.*
cmake_install.cmake
config.mk
config.guess
...
...
This diff is collapsed.
Click to expand it.
exports
→
extra/
exports
+
0
−
0
View file @
f0d9ee2e
File moved
This diff is collapsed.
Click to expand it.
src/CMakeLists.txt
+
10
−
9
View file @
f0d9ee2e
...
...
@@ -198,13 +198,15 @@ set(TARANTOOL_C_FLAGS ${CMAKE_C_FLAGS} PARENT_SCOPE)
set
(
TARANTOOL_CXX_FLAGS
${
CMAKE_CXX_FLAGS
}
PARENT_SCOPE
)
# Exports syntax is toolchain-dependent, preprocessing is necessary
add_custom_target
(
preprocess_exports DEPENDS
${
CMAKE_BINARY_DIR
}
/exports2
)
set
(
exports_file
${
CMAKE_BINARY_DIR
}
/extra/exports.
${
CMAKE_SYSTEM_NAME
}
)
add_custom_target
(
preprocess_exports
DEPENDS
${
exports_file
}
)
add_custom_command
(
OUTPUT
${
CMAKE_BINARY_DIR
}
/
exports
2
DEPENDS
${
CMAKE_SOURCE_DIR
}
/exports
OUTPUT
${
exports
_file
}
DEPENDS
${
CMAKE_SOURCE_DIR
}
/
extra/
exports
COMMAND
${
CMAKE_SOURCE_DIR
}
/extra/mkexports
${
CMAKE_SOURCE_DIR
}
/exports
${
CMAKE_BINARY_DIR
}
/
exports
2
${
CMAKE_SYSTEM_NAME
}
)
${
CMAKE_SOURCE_DIR
}
/
extra/
exports
${
exports
_file
}
${
CMAKE_SYSTEM_NAME
}
)
add_executable
(
tarantool main.cc title.c
...
...
@@ -214,8 +216,7 @@ add_executable(
add_dependencies
(
tarantool build_bundled_libs preprocess_exports
)
# Re-link if exports changed
set_target_properties
(
tarantool PROPERTIES
LINK_DEPENDS
${
CMAKE_BINARY_DIR
}
/exports2
)
set_target_properties
(
tarantool PROPERTIES LINK_DEPENDS
${
exports_file
}
)
# A note about linkers:
# [GNU linker] When linking an *executable* visibility is ignored, and
...
...
@@ -236,14 +237,14 @@ if (TARGET_OS_DARWIN)
# http://luajit.org/install.html
set_target_properties
(
tarantool PROPERTIES
LINK_FLAGS
"-pagezero_size 10000 -image_base 100000000 \
-Wl,-exported_symbols_list,
${
CMAKE_BINARY_DIR
}
/
exports
2
"
)
-Wl,-exported_symbols_list,
${
exports
_file
}
"
)
else
()
target_link_libraries
(
tarantool
-Wl,--whole-archive box
${
reexport_libraries
}
salad -Wl,--no-whole-archive
${
common_libraries
}
)
set_target_properties
(
tarantool PROPERTIES LINK_FLAGS
"-Wl,--gc-sections -Wl,--dynamic-list,
${
CMAKE_BINARY_DIR
}
/
exports
2
"
)
"-Wl,--gc-sections -Wl,--dynamic-list,
${
exports
_file
}
"
)
# get rid of -rdynamic
set
(
CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS
""
)
endif
()
...
...
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