Skip to content

Commit 8a33a66

Browse files
pdarraghpdarragh
committed
Update Makefiles
1 parent d3d827a commit 8a33a66

9 files changed

Lines changed: 48 additions & 60 deletions

File tree

‎dupe-plus-plus/Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
ifeq ($(shell uname), Darwin)
2-
LANGS_CC ?= arch -x86_64 gcc
3-
LANGS_AS ?= nasm -g -f macho64 --gprefix _
2+
LANGS_CC ?= arch -x86_64 clang
3+
LANGS_AS ?= arch -x86_64 clang -c
44
else
5-
LANGS_CC ?= gcc
6-
LANGS_AS ?= nasm -g -f elf64
5+
LANGS_CC ?= clang
6+
LANGS_AS ?= clang -c
77
endif
88

99
objs = \

‎dupe-plus/Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
ifeq ($(shell uname), Darwin)
2-
LANGS_CC ?= arch -x86_64 gcc
3-
LANGS_AS ?= nasm -g -f macho64 --gprefix _
2+
LANGS_CC ?= arch -x86_64 clang
3+
LANGS_AS ?= arch -x86_64 clang -c
44
else
5-
LANGS_CC ?= gcc
6-
LANGS_AS ?= nasm -g -f elf64
5+
LANGS_CC ?= clang
6+
LANGS_AS ?= clang -c
77
endif
88

99
objs = \

‎extort-plus/Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
ifeq ($(shell uname), Darwin)
2-
LANGS_CC ?= arch -x86_64 gcc
3-
LANGS_AS ?= nasm -g -f macho64 --gprefix _
2+
LANGS_CC ?= arch -x86_64 clang
3+
LANGS_AS ?= arch -x86_64 clang -c
44
else
5-
LANGS_CC ?= gcc
6-
LANGS_AS ?= nasm -g -f elf64
5+
LANGS_CC ?= clang
6+
LANGS_AS ?= clang -c
77
endif
88

99
objs = \

‎fraud-plus/Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
ifeq ($(shell uname), Darwin)
2-
LANGS_CC ?= arch -x86_64 gcc
3-
LANGS_AS ?= nasm -g -f macho64 --gprefix _
2+
LANGS_CC ?= arch -x86_64 clang
3+
LANGS_AS ?= arch -x86_64 clang -c
44
else
5-
LANGS_CC ?= gcc
6-
LANGS_AS ?= nasm -g -f elf64
5+
LANGS_CC ?= clang
6+
LANGS_AS ?= clang -c
77
endif
88

99
objs = \

‎hoax-plus/Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
ifeq ($(shell uname), Darwin)
2-
LANGS_CC ?= arch -x86_64 gcc
3-
LANGS_AS ?= nasm -g -f macho64 --gprefix _
2+
LANGS_CC ?= arch -x86_64 clang
3+
LANGS_AS ?= arch -x86_64 clang -c
44
else
5-
LANGS_CC ?= gcc
6-
LANGS_AS ?= nasm -g -f elf64
5+
LANGS_CC ?= clang
6+
LANGS_AS ?= clang -c
77
endif
88

99
objs = \

‎iniquity-plus/Makefile‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
1-
UNAME := $(shell uname)
2-
.PHONY: test submit.zip
3-
4-
ifeq ($(UNAME), Darwin)
5-
format=macho64
6-
CC=arch -x86_64 gcc
1+
ifeq ($(shell uname), Darwin)
2+
LANGS_CC ?= arch -x86_64 clang
3+
LANGS_AS ?= arch -x86_64 clang -c
74
else
8-
format=elf64
9-
CC=gcc
5+
LANGS_CC ?= clang
6+
LANGS_AS ?= clang -c
107
endif
118

129
objs = \
@@ -15,9 +12,9 @@ objs = \
1512
values.o \
1613
io.o
1714

18-
default: submit.zip
15+
.DEFAULT_GOAL: submit.zip
1916

20-
submit.zip:
17+
submit.zip: $(shell find . -name "*.rkt" -o -name "*.c")
2118
zip submit.zip -r * \
2219
-x \*.[os] -x \*~ -x \*zip \
2320
-x \*Zone.Identifier -x \*\*compiled\*\*
@@ -26,13 +23,13 @@ runtime.o: $(objs)
2623
ld -r $(objs) -o runtime.o
2724

2825
%.run: %.o runtime.o
29-
$(CC) runtime.o $< -o $@
26+
$(LANGS_CC) runtime.o $< -o $@
3027

3128
.c.o:
32-
$(CC) -fPIC -c -g -o $@ $<
29+
$(LANGS_CC) -fPIC -c -g -o $@ $<
3330

3431
.s.o:
35-
nasm -g -f $(format) -o $@ $<
32+
$(LANGS_AS) -o $@ $<
3633

3734
%.s: %.rkt
3835
cat $< | racket -t compile-stdin.rkt -m > $@

‎knock-plus/Makefile‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
1-
UNAME := $(shell uname)
2-
.PHONY: test submit.zip
3-
41
ifeq ($(shell uname), Darwin)
5-
LANGS_CC ?= arch -x86_64 gcc
6-
LANGS_AS ?= nasm -g -f macho64 --gprefix _
2+
LANGS_CC ?= arch -x86_64 clang
3+
LANGS_AS ?= arch -x86_64 clang -c
74
else
8-
LANGS_CC ?= gcc
9-
LANGS_AS ?= nasm -g -f elf64
5+
LANGS_CC ?= clang
6+
LANGS_AS ?= clang -c
107
endif
118

129
objs = \
@@ -15,9 +12,9 @@ objs = \
1512
values.o \
1613
io.o
1714

18-
default: submit.zip
15+
.DEFAULT_GOAL: submit.zip
1916

20-
submit.zip:
17+
submit.zip: $(shell find . -name "*.rkt" -o -name "*.c")
2118
zip submit.zip -r * \
2219
-x \*.[os] -x \*~ -x \*zip \
2320
-x \*Zone.Identifier -x \*\*compiled\*\*

‎loot-bignums/Makefile‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
1-
UNAME := $(shell uname)
2-
.PHONY: test submit.zip
3-
41
ifeq ($(shell uname), Darwin)
5-
LANGS_CC ?= arch -x86_64 gcc
6-
LANGS_AS ?= nasm -g -f macho64 --gprefix _
2+
LANGS_CC ?= arch -x86_64 clang
3+
LANGS_AS ?= arch -x86_64 clang -c
74
else
8-
LANGS_CC ?= gcc
9-
LANGS_AS ?= nasm -g -f elf64
5+
LANGS_CC ?= clang
6+
LANGS_AS ?= clang -c
107
endif
118

129
objs = \
@@ -15,9 +12,9 @@ objs = \
1512
values.o \
1613
io.o
1714

18-
default: submit.zip
15+
.DEFAULT_GOAL: submit.zip
1916

20-
submit.zip:
17+
submit.zip: $(shell find . -name "*.rkt" -o -name "*.c")
2118
zip submit.zip -r * \
2219
-x \*.[os] -x \*~ -x \*zip \
2320
-x \*Zone.Identifier -x \*\*compiled\*\*

‎loot-exceptions/Makefile‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
1-
UNAME := $(shell uname)
2-
.PHONY: test submit.zip
3-
41
ifeq ($(shell uname), Darwin)
5-
LANGS_CC ?= arch -x86_64 gcc
6-
LANGS_AS ?= nasm -g -f macho64 --gprefix _
2+
LANGS_CC ?= arch -x86_64 clang
3+
LANGS_AS ?= arch -x86_64 clang -c
74
else
8-
LANGS_CC ?= gcc
9-
LANGS_AS ?= nasm -g -f elf64
5+
LANGS_CC ?= clang
6+
LANGS_AS ?= clang -c
107
endif
118

129
objs = \
@@ -15,9 +12,9 @@ objs = \
1512
values.o \
1613
io.o
1714

18-
default: submit.zip
15+
.DEFAULT_GOAL: submit.zip
1916

20-
submit.zip:
17+
submit.zip: $(shell find . -name "*.rkt" -o -name "*.c")
2118
zip submit.zip -r * \
2219
-x \*.[os] -x \*~ -x \*zip \
2320
-x \*Zone.Identifier -x \*\*compiled\*\*

0 commit comments

Comments
 (0)