Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
Frama Clang
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
Stefan Gränitz
Frama Clang
Commits
a8b49564
"tests/pyrat_onnx.t" did not exist on "fffaf47f502d3dd9bc2787da02a862c292d58bfe"
Commit
a8b49564
authored
4 years ago
by
Virgile Prevosto
Browse files
Options
Downloads
Patches
Plain Diff
[Makefile] fix link directive in static mode
parent
6fa36b45
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Makefile.clang
+1
-9
1 addition, 9 deletions
Makefile.clang
Makefile.config.in
+1
-0
1 addition, 0 deletions
Makefile.config.in
configure.ac
+4
-0
4 additions, 0 deletions
configure.ac
with
6 additions
and
9 deletions
Makefile.clang
+
1
−
9
View file @
a8b49564
...
@@ -76,21 +76,13 @@ LLVM_MAJOR:= $(shell echo $(LLVM_VERSION) | sed -e 's/^\([0-9]*\).*/\1/')
...
@@ -76,21 +76,13 @@ LLVM_MAJOR:= $(shell echo $(LLVM_VERSION) | sed -e 's/^\([0-9]*\).*/\1/')
LLVM_MAJOR_10
:=
\
LLVM_MAJOR_10
:=
\
$(
shell
if
test
$(
LLVM_MAJOR
)
-ge
10
;
then
echo
"yes"
;
else
echo
"no"
;
fi
)
$(
shell
if
test
$(
LLVM_MAJOR
)
-ge
10
;
then
echo
"yes"
;
else
echo
"no"
;
fi
)
#LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser support mc
ifeq
("$(LLVM_MAJOR_10)","yes")
USEDLIBS
=
clang-cpp
else
USEDLIBS
=
clangFrontend clangDriver clangParse clangSema clangAnalysis
\
clangEdit clangAST clangLex clangSerialization clangBasic
endif
# for use in main Makefile
# for use in main Makefile
default
:
$(PLUGIN_DIR)/bin/$(TOOLNAME)
default
:
$(PLUGIN_DIR)/bin/$(TOOLNAME)
$(PLUGIN_DIR)/bin/$(TOOLNAME)
:
$(OBJS) $(PLUGIN_DIR)/bin
$(PLUGIN_DIR)/bin/$(TOOLNAME)
:
$(OBJS) $(PLUGIN_DIR)/bin
$(
PRINT_LINKING
)
$@
$(
PRINT_LINKING
)
$@
$(
CXX
)
$(
CLANG_LINKFLAGS
)
-o
$@
\
$(
CXX
)
$(
CLANG_LINKFLAGS
)
-o
$@
\
$(
OBJS
)
$(
addprefix
-l
,
$(
USED
LIBS
))
$(
LLVM_LIBS
)
$(
CLANG_SYSLIBS
)
$(
CLANG_LINKFLAGS
)
$(
OBJS
)
$(
addprefix
-l
,
$(
CLANG_
LIBS
))
$(
LLVM_LIBS
)
$(
CLANG_SYSLIBS
)
$(
CLANG_LINKFLAGS
)
$(PLUGIN_DIR)/bin
:
$(PLUGIN_DIR)/bin
:
$(
MKDIR
)
$@
$(
MKDIR
)
$@
...
...
This diff is collapsed.
Click to expand it.
Makefile.config.in
+
1
−
0
View file @
a8b49564
...
@@ -30,6 +30,7 @@ CLANG_LINKFLAGS=@CLANG_LINKFLAGS@
...
@@ -30,6 +30,7 @@ CLANG_LINKFLAGS=@CLANG_LINKFLAGS@
CLANG_SYSLIBS
=
@CLANG_SYSLIBS@
CLANG_SYSLIBS
=
@CLANG_SYSLIBS@
CLANG_BIN_DIR
=
@CLANG_BIN_DIR@
CLANG_BIN_DIR
=
@CLANG_BIN_DIR@
LLVM_LIBS
=
@LLVM_LIBS@
LLVM_LIBS
=
@LLVM_LIBS@
CLANG_LIBS
=
@CLANG_LIBS@
LLVM_VERSION
=
@LLVM_VERSION@
LLVM_VERSION
=
@LLVM_VERSION@
DEFAULT_FC_C_HEADERS
=
@DEFAULT_FC_C_HEADERS@
DEFAULT_FC_C_HEADERS
=
@DEFAULT_FC_C_HEADERS@
DEFAULT_FC_CXX_HEADERS
=
@DEFAULT_FC_CXX_HEADERS@
DEFAULT_FC_CXX_HEADERS
=
@DEFAULT_FC_CXX_HEADERS@
...
...
This diff is collapsed.
Click to expand it.
configure.ac
+
4
−
0
View file @
a8b49564
...
@@ -54,6 +54,7 @@ AC_SUBST(CLANG_LINKFLAGS)
...
@@ -54,6 +54,7 @@ AC_SUBST(CLANG_LINKFLAGS)
AC_SUBST(CLANG_SYSLIBS)
AC_SUBST(CLANG_SYSLIBS)
AC_SUBST(CLANG_BIN_DIR)
AC_SUBST(CLANG_BIN_DIR)
AC_SUBST(LLVM_LIBS)
AC_SUBST(LLVM_LIBS)
AC_SUBST(CLANG_LIBS)
AC_SUBST(LLVM_VERSION)
AC_SUBST(LLVM_VERSION)
AC_SUBST(DEFAULT_FC_C_HEADERS)
AC_SUBST(DEFAULT_FC_C_HEADERS)
AC_SUBST(DEFAULT_FC_CXX_HEADERS)
AC_SUBST(DEFAULT_FC_CXX_HEADERS)
...
@@ -108,8 +109,11 @@ CLANG_SYSLIBS="$($LLVM_CONFIG --system-libs)"
...
@@ -108,8 +109,11 @@ CLANG_SYSLIBS="$($LLVM_CONFIG --system-libs)"
CLANG_BIN_DIR="$($LLVM_CONFIG --bindir)"
CLANG_BIN_DIR="$($LLVM_CONFIG --bindir)"
if test "$LLVM_SHARED_MODE" = "shared"; then
if test "$LLVM_SHARED_MODE" = "shared"; then
LLVM_LIBS=$($LLVM_CONFIG --libs core);
LLVM_LIBS=$($LLVM_CONFIG --libs core);
CLANG_LIBS=clang-cpp
else
else
LLVM_LIBS=$($LLVM_CONFIG --libs profiledata asmparser mc mcparser support bitreader option);
LLVM_LIBS=$($LLVM_CONFIG --libs profiledata asmparser mc mcparser support bitreader option);
CLANG_LIBS=clangFrontend clangDriver clangParse clangSema clangAnalysis \
clangEdit clangAST clangLex clangSerialization clangBasic
fi
fi
fi
fi
...
...
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