Compare commits
65 Commits
a770b67b08
...
822a2b7d43
Author | SHA1 | Date | |
---|---|---|---|
822a2b7d43 | |||
4d6ac5cf30 | |||
e954059c79 | |||
3bc85b7929 | |||
3ce57443e2 | |||
8e3535545c | |||
92c0cf0236 | |||
40ec7fd707 | |||
e311f9cb51 | |||
0f9ed8ae58 | |||
141b212e88 | |||
6b8fe49e5a | |||
e7ccfe1985 | |||
5862b32793 | |||
7c8e2d4da7 | |||
97994bfe6f | |||
e9423f3c39 | |||
25053481f9 | |||
b728c0d512 | |||
a86d9ea2ac | |||
5984151a83 | |||
f9fa4bdd97 | |||
974ad4dbd0 | |||
9a46033a9b | |||
6301138c14 | |||
02593d4210 | |||
00b7731281 | |||
87047127bd | |||
cd1342bc6a | |||
768ab9882f | |||
95f9a8ecb8 | |||
95fe212e28 | |||
0ccaaccb0d | |||
e6274b0dd2 | |||
61a196dd42 | |||
c4f57b0c38 | |||
83f898ff17 | |||
f885831223 | |||
6857d2cd5c | |||
5c8bbc1b4b | |||
af1ffa8459 | |||
2646e6850f | |||
f81f1a59e3 | |||
0ba0558585 | |||
d1a9613607 | |||
214a3bb274 | |||
c6b4ad6ca1 | |||
1f9344e727 | |||
01cb2fbd11 | |||
ee2f3d0af3 | |||
907bdb8d68 | |||
94ecefaac6 | |||
e826538db1 | |||
a65c0a851b | |||
1b414937da | |||
1db11bb0ac | |||
ded85b6b5c | |||
c6369f9132 | |||
3546ed6de6 | |||
1b2c67fb50 | |||
4614590cc7 | |||
41ab847ac9 | |||
1fd61f26be | |||
ab23c6103b | |||
d66aa31b2c |
@ -55,8 +55,3 @@ target_compile_options(luna-freestanding PRIVATE -mno-80387 -mno-mmx -mno-sse -m
|
|||||||
target_compile_definitions(luna-freestanding PUBLIC ARCH_X86_64)
|
target_compile_definitions(luna-freestanding PUBLIC ARCH_X86_64)
|
||||||
target_compile_definitions(luna PUBLIC ARCH_X86_64)
|
target_compile_definitions(luna PUBLIC ARCH_X86_64)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_custom_command(
|
|
||||||
TARGET luna
|
|
||||||
COMMAND "${CMAKE_COMMAND}" -E copy ${CMAKE_CURRENT_BINARY_DIR}/libluna.a ${LUNA_BASE}/usr/lib/libluna.a
|
|
||||||
)
|
|
||||||
|
@ -27,8 +27,3 @@ target_include_directories(os PUBLIC ${LUNA_BASE}/usr/include)
|
|||||||
if("${LUNA_ARCH}" MATCHES "x86_64")
|
if("${LUNA_ARCH}" MATCHES "x86_64")
|
||||||
target_compile_definitions(os PUBLIC ARCH_X86_64)
|
target_compile_definitions(os PUBLIC ARCH_X86_64)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_custom_command(
|
|
||||||
TARGET os
|
|
||||||
COMMAND "${CMAKE_COMMAND}" -E copy ${CMAKE_CURRENT_BINARY_DIR}/libos.a ${LUNA_BASE}/usr/lib/libos.a
|
|
||||||
)
|
|
||||||
|
@ -58,7 +58,7 @@ case $format in
|
|||||||
tar xf $output
|
tar xf $output
|
||||||
;;
|
;;
|
||||||
git)
|
git)
|
||||||
if ! [ -d $srcdir ]; then
|
if ! [ -d $srcdir]; then
|
||||||
echo "Cloning repository for $name..."
|
echo "Cloning repository for $name..."
|
||||||
git clone $url $srcdir
|
git clone $url $srcdir
|
||||||
else
|
else
|
||||||
@ -78,11 +78,9 @@ esac
|
|||||||
if ! [ "$set_cc_variables" = "no" ]; then
|
if ! [ "$set_cc_variables" = "no" ]; then
|
||||||
export CC=x86_64-luna-gcc
|
export CC=x86_64-luna-gcc
|
||||||
export CXX=x86_64-luna-g++
|
export CXX=x86_64-luna-g++
|
||||||
export AR=x86_64-luna-ar
|
|
||||||
export PKG_CONFIG=luna-pkg-config
|
export PKG_CONFIG=luna-pkg-config
|
||||||
export CC_FOR_BUILD=gcc
|
export CC_FOR_BUILD=gcc
|
||||||
export CXX_FOR_BUILD=g++
|
export CXX_FOR_BUILD=g++
|
||||||
export AR_FOR_BUILD=ar
|
|
||||||
export PKG_CONFIG_FOR_BUILD=pkg-config
|
export PKG_CONFIG_FOR_BUILD=pkg-config
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user