Skip to content

Update XSTL to latest, fix some building issue in Ubuntu and CentOS #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ouliuquan wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update XSTL to latest, fix some building issue in Ubuntu and CentOS #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b3f66b6
update submodule XSTL to last version
Jul 14, 2023
94d0a3d
remove LLVM_HOME env
Jul 14, 2023
83d6266
update README: add llvm-config for CentOS/RedHat 8
Jul 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 3rdparty/xstl
Open in desktop
Submodule xstl updated 26 files
+2 −1 .gitignore
+2 −2 Makefile
+16 −15 README.md
+2 −1 examples/cast.cpp
+4 −4 examples/deprecated/range.cpp
+12 −0 examples/embed.cpp
+0 −1 xstl
+0 −0 xstl/argparse.h
+1 −1 xstl/bitpat.h
+0 −0 xstl/bitvalue.h
+0 −0 xstl/cast.h
+0 −0 xstl/deprecated/argh.h
+0 −0 xstl/deprecated/gc/gc.h
+0 −0 xstl/deprecated/gc/gc_object.h
+0 −0 xstl/deprecated/gc/smart_gc.h
+0 −0 xstl/deprecated/gc/smart_ptr.h
+0 −0 xstl/deprecated/raii.h
+0 −0 xstl/deprecated/range.h
+0 −0 xstl/deprecated/str_hash.h
+31 −0 xstl/embed.h
+3 −0 xstl/guard.h
+31 −4 xstl/nested.h
+0 −0 xstl/os.h
+0 −0 xstl/progress.h
+0 −0 xstl/singleton.h
+0 −0 xstl/style.h
3 changes: 2 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ file(GLOB_RECURSE SOURCES "src/*.cpp")
# executable
add_executable(yuc ${SOURCES})
link_directories(${LLVM_LIBRARY_DIRS})
target_link_libraries(yuc LLVM)
# CentOS 8 need stdc++fs option
target_link_libraries(yuc LLVM stdc++fs)

# build Yu standard library and examples after generation
add_custom_command(
Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ Before building YuLang compiler, please make sure you have installed the followi

* `cmake` 3.13 or later
* `llvm` 10.0 or later
* `llvm-devel` for CentOS/RedHat 8, provides the `llvm-config`
* C++ compiler supporting C++17

You may want to check the toolchain configuration in `toolchain.mk`. Then you can build this repository by executing the following command lines:
Expand Down
7 changes: 4 additions & 3 deletions toolchain.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ else
endif

# compile toolchain prefix
LLVM_HOME := /usr/local/opt/llvm/bin
#LLVM_HOME := /usr/local/opt/llvm/bin

# Yu compiler
YUFLAGS := -Werror $(YU_OPT_ARG)
Expand All @@ -23,11 +23,12 @@ export YUC := $(YUC_BIN) $(YUFLAGS)

# LLVM compiler
LLCFLAGS := $(C_OPT_ARG) -filetype=obj
export LLC := $(LLVM_HOME)/llc $(LLCFLAGS)
export LLC := llc $(LLCFLAGS)

# linker
# Ubuntu needs -no-pie option
LDFLAGS :=
export LD := clang $(LDFLAGS)
export LD := clang -no-pie $(LDFLAGS)

# archiver
ARFLAGS := ru
Expand Down