AwesomeAdam54321/inweb-bootstrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4 from ptomato/linux-platform-adjustments

Browse source 
Changes to Linux platform settings
This commit is contained in:
Graham Nelson 2022-04-28 19:13:33 +01:00 committed by GitHub
commit 329441fa66
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Materials/platforms/inweb-on-linux.mk
View file

@ -12,7 +12,8 @@ EXEEXTENSION =
INTEST = intest/Tangled/intest
INWEB = inweb/Tangled/inweb
CCOPTS = -D_POSIX_C_SOURCE=200112L -D_DEFAULT_SOURCE -DPLATFORM_LINUX -fdiagnostics-color=auto -O2
CCOPTS = -D_POSIX_C_SOURCE=200112L -D_DEFAULT_SOURCE -DPLATFORM_LINUX \
-fdiagnostics-color=auto $(CFLAGS)
MANYWARNINGS = -Wall -Wextra -Wimplicit-fallthrough=2 -Wno-pointer-to-int-cast \
-Wno-unknown-pragmas -Wno-unused-but-set-parameter \
@ -69,7 +70,7 @@ safe:
define make-me-once-tangled
gcc -std=c11 -c $(MANYWARNINGS) $(CCOPTS) -g -o $(ME)/Tangled/$(ME).o $(ME)/Tangled/$(ME).c
gcc $(CCOPTS) -g -o $(ME)/Tangled/$(ME)$(EXEEXTENSION) $(ME)/Tangled/$(ME).o -lm
gcc $(CCOPTS) -o $(ME)/Tangled/$(ME)$(EXEEXTENSION) $(ME)/Tangled/$(ME).o -lm -pthread $(LDFLAGS)
endef
define make-me

3
Materials/platforms/linux.mk
View file

@ -12,7 +12,8 @@ EXEEXTENSION =
INTEST = intest/Tangled/intest
INWEB = inweb/Tangled/inweb
CCOPTS = -D_POSIX_C_SOURCE=200112L -D_DEFAULT_SOURCE -DPLATFORM_LINUX -fdiagnostics-color=auto -O2
CCOPTS = -D_POSIX_C_SOURCE=200112L -D_DEFAULT_SOURCE -DPLATFORM_LINUX \
-fdiagnostics-color=auto $(CFLAGS)
MANYWARNINGS = -Wall -Wextra -Wimplicit-fallthrough=2 -Wno-pointer-to-int-cast \
-Wno-unknown-pragmas -Wno-unused-but-set-parameter \

10
Materials/platforms/linux.mkscript
View file

@ -73,15 +73,17 @@ INWEB = inweb/Tangled/inweb
{end-define}
{define: link to: TO from: FROM ?options: OPTS}
gcc $(CCOPTS) -g -o {TO} {FROM} {OPTS} -lm
gcc $(CCOPTS) -o {TO} {FROM} {OPTS} -lm -pthread $(LDFLAGS)
{end-define}
# Where:
# Basic options; color error messages and optimization; _POSIX_C_SOURCE is
# necessary for readlink().
# Source options (_POSIX_C_SOURCE is necessary for readlink()); color error
# messages; pull in optimization and debug flags from whatever is defined in the
# CFLAGS and LDFLAGS environment variables by the Linux packaging config.
CCOPTS = -D_POSIX_C_SOURCE=200112L -D_DEFAULT_SOURCE -DPLATFORM_LINUX -fdiagnostics-color=auto -O2
CCOPTS = -D_POSIX_C_SOURCE=200112L -D_DEFAULT_SOURCE -DPLATFORM_LINUX \
-fdiagnostics-color=auto $(CFLAGS)
MANYWARNINGS = -Wall -Wextra -Wimplicit-fallthrough=2 -Wno-pointer-to-int-cast \
-Wno-unknown-pragmas -Wno-unused-but-set-parameter \