berkus
/
essence-os
mirror of https://gitlab.com/nakst/essence
1
0
Fork 0
Code Releases Activity

HOST_DARWIN

This commit is contained in:
nakst 2022-01-01 22:51:39 +00:00
parent 2e08f0442f
commit 43c399eaaf
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
start.sh
View File

@ -14,6 +14,7 @@ if [ $? -ne 1 ]; then
fi fi
# Setup for Darwin. # Setup for Darwin.
HOST_FLAGS=""
uname -a | grep Darwin > /dev/null uname -a | grep Darwin > /dev/null
if [ $? -ne 1 ]; then if [ $? -ne 1 ]; then
export CC=gcc-11 export CC=gcc-11
@ -24,6 +25,8 @@ if [ $? -ne 1 ]; then
alias gcc="gcc-11" alias gcc="gcc-11"
alias g++="g++-11" alias g++="g++-11"
alias sed="gsed" alias sed="gsed"
HOST_FLAGS="-DHOST_DARWIN"
echo Detected host Darwin.
fi fi
# Check that the source code is valid. # Check that the source code is valid.
@ -69,6 +72,6 @@ if [ $? -ne 0 ]; then
fi fi
# Compile and run Build. # Compile and run Build.
gcc -o bin/build -g util/build.c -pthread -DPARALLEL_BUILD -D${ES_TARGET-TARGET_X86_64} \ gcc -o bin/build -g util/build.c -pthread -DPARALLEL_BUILD -D${ES_TARGET-TARGET_X86_64} $HOST_FLAGS \
-Wall -Wextra -Wno-format-security -Wno-format-overflow -Wno-missing-field-initializers -Wno-unused-function -Wno-format-truncation \ -Wall -Wextra -Wno-format-security -Wno-format-overflow -Wno-missing-field-initializers -Wno-unused-function -Wno-format-truncation \
&& bin/build "$@" && bin/build "$@"

6
util/build.c
View File

@ -398,7 +398,7 @@ void Build(int optimise, bool compile) {
} }
#endif #endif
#ifndef __APPLE__ #ifndef HOST_DARWIN
CallSystem("ctags -R " CallSystem("ctags -R "
"--exclude=old/* " "--exclude=old/* "
"--exclude=root/* " "--exclude=root/* "
@ -642,7 +642,7 @@ void BuildCrossCompiler() {
if (CallSystem("which sed > /dev/null 2>&1")) { printf("Error: Missing sed.\n"); missingPackages = true; } if (CallSystem("which sed > /dev/null 2>&1")) { printf("Error: Missing sed.\n"); missingPackages = true; }
if (CallSystem("which awk > /dev/null 2>&1")) { printf("Error: Missing awk.\n"); missingPackages = true; } if (CallSystem("which awk > /dev/null 2>&1")) { printf("Error: Missing awk.\n"); missingPackages = true; }
#ifdef __APPLE__ #ifdef HOST_DARWIN
if (CallSystem("gcc -L/opt/homebrew/lib -lmpc 2>&1 | grep -i undefined > /dev/null")) { printf("Error: Missing GNU MPC.\n"); missingLibraries = true; } if (CallSystem("gcc -L/opt/homebrew/lib -lmpc 2>&1 | grep -i undefined > /dev/null")) { printf("Error: Missing GNU MPC.\n"); missingLibraries = true; }
if (CallSystem("gcc -L/opt/homebrew/lib -lmpfr 2>&1 | grep -i undefined > /dev/null")) { printf("Error: Missing GNU MPFR.\n"); missingLibraries = true; } if (CallSystem("gcc -L/opt/homebrew/lib -lmpfr 2>&1 | grep -i undefined > /dev/null")) { printf("Error: Missing GNU MPFR.\n"); missingLibraries = true; }
if (CallSystem("gcc -L/opt/homebrew/lib -lgmp 2>&1 | grep -i undefined > /dev/null")) { printf("Error: Missing GNU GMP.\n"); missingLibraries = true; } if (CallSystem("gcc -L/opt/homebrew/lib -lgmp 2>&1 | grep -i undefined > /dev/null")) { printf("Error: Missing GNU GMP.\n"); missingLibraries = true; }
@ -1227,7 +1227,7 @@ void GetSource(const char *parameters, const char *checksum) {
free(alternateURL); free(alternateURL);
#ifdef __APPLE__ #ifdef HOST_DARWIN
#define SHA256SUM "sha256 -a 256" #define SHA256SUM "sha256 -a 256"
#else #else
#define SHA256SUM "sha256sum" #define SHA256SUM "sha256sum"