Skip to content

Commit 2cc2cdc

Browse files
committed
Merge branch 'stdin' of github.com:cmsc430/www into stdin
2 parents 6f3c7f9 + 75888e4 commit 2cc2cdc

File tree

19 files changed

+76
-38
lines changed

19 files changed

+76
-38
lines changed

langs/abscond/Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@ UNAME := $(shell uname)
22

33
ifeq ($(UNAME), Darwin)
44
format=macho64
5+
CC=arch -x86_64 gcc
56
else
67
format=elf64
8+
CC=gcc
79
endif
810

911
objs = \
@@ -16,10 +18,10 @@ runtime.o: $(objs)
1618
ld -r $(objs) -o runtime.o
1719

1820
%.run: %.o runtime.o
19-
arch -x86_64 gcc runtime.o $< -o $@
21+
$(CC) runtime.o $< -o $@
2022

2123
.c.o:
22-
arch -x86_64 gcc -fPIC -c -g -o $@ $<
24+
$(CC) -fPIC -c -g -o $@ $<
2325

2426
.s.o:
2527
nasm -g -f $(format) -o $@ $<

langs/blackmail/Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@ UNAME := $(shell uname)
22

33
ifeq ($(UNAME), Darwin)
44
format=macho64
5+
CC=arch -x86_64 gcc
56
else
67
format=elf64
8+
CC=gcc
79
endif
810

911
objs = \
@@ -16,10 +18,10 @@ runtime.o: $(objs)
1618
ld -r $(objs) -o runtime.o
1719

1820
%.run: %.o runtime.o
19-
arch -x86_64 gcc runtime.o $< -o $@
21+
$(CC) runtime.o $< -o $@
2022

2123
.c.o:
22-
arch -x86_64 gcc -fPIC -c -g -o $@ $<
24+
$(CC) -fPIC -c -g -o $@ $<
2325

2426
.s.o:
2527
nasm -g -f $(format) -o $@ $<

langs/con/Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@ UNAME := $(shell uname)
22

33
ifeq ($(UNAME), Darwin)
44
format=macho64
5+
CC=arch -x86_64 gcc
56
else
67
format=elf64
8+
CC=gcc
79
endif
810

911
objs = \
@@ -16,10 +18,10 @@ runtime.o: $(objs)
1618
ld -r $(objs) -o runtime.o
1719

1820
%.run: %.o runtime.o
19-
arch -x86_64 gcc runtime.o $< -o $@
21+
$(CC) runtime.o $< -o $@
2022

2123
.c.o:
22-
arch -x86_64 gcc -fPIC -c -g -o $@ $<
24+
$(CC) -fPIC -c -g -o $@ $<
2325

2426
.s.o:
2527
nasm -g -f $(format) -o $@ $<

langs/dodger/Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@ UNAME := $(shell uname)
22

33
ifeq ($(UNAME), Darwin)
44
format=macho64
5+
CC=arch -x86_64 gcc
56
else
67
format=elf64
8+
CC=gcc
79
endif
810

911
objs = \
@@ -17,10 +19,10 @@ runtime.o: $(objs)
1719
ld -r $(objs) -o runtime.o
1820

1921
%.run: %.o runtime.o
20-
arch -x86_64 gcc runtime.o $< -o $@
22+
$(CC) runtime.o $< -o $@
2123

2224
.c.o:
23-
arch -x86_64 gcc -fPIC -c -g -o $@ $<
25+
$(CC) -fPIC -c -g -o $@ $<
2426

2527
.s.o:
2628
nasm -g -f $(format) -o $@ $<

langs/dupe/Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@ UNAME := $(shell uname)
22

33
ifeq ($(UNAME), Darwin)
44
format=macho64
5+
CC=arch -x86_64 gcc
56
else
67
format=elf64
8+
CC=gcc
79
endif
810

911
objs = \
@@ -17,10 +19,10 @@ runtime.o: $(objs)
1719
ld -r $(objs) -o runtime.o
1820

1921
%.run: %.o runtime.o
20-
arch -x86_64 gcc runtime.o $< -o $@
22+
$(CC) runtime.o $< -o $@
2123

2224
.c.o:
23-
arch -x86_64 gcc -fPIC -c -g -o $@ $<
25+
$(CC) -fPIC -c -g -o $@ $<
2426

2527
.s.o:
2628
nasm -g -f $(format) -o $@ $<

langs/evildoer/Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@ UNAME := $(shell uname)
22

33
ifeq ($(UNAME), Darwin)
44
format=macho64
5+
CC=arch -x86_64 gcc
56
else
67
format=elf64
8+
CC=gcc
79
endif
810

911
objs = \
@@ -18,10 +20,10 @@ runtime.o: $(objs)
1820
ld -r $(objs) -o runtime.o
1921

2022
%.run: %.o runtime.o
21-
arch -x86_64 gcc runtime.o $< -o $@
23+
$(CC) runtime.o $< -o $@
2224

2325
.c.o:
24-
arch -x86_64 gcc -fPIC -c -g -o $@ $<
26+
$(CC) -fPIC -c -g -o $@ $<
2527

2628
.s.o:
2729
nasm -g -f $(format) -o $@ $<

langs/extort/Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@ UNAME := $(shell uname)
22

33
ifeq ($(UNAME), Darwin)
44
format=macho64
5+
CC=arch -x86_64 gcc
56
else
67
format=elf64
8+
CC=gcc
79
endif
810

911
objs = \
@@ -18,10 +20,10 @@ runtime.o: $(objs)
1820
ld -r $(objs) -o runtime.o
1921

2022
%.run: %.o runtime.o
21-
arch -x86_64 gcc runtime.o $< -o $@
23+
$(CC) runtime.o $< -o $@
2224

2325
.c.o:
24-
arch -x86_64 gcc -fPIC -c -g -o $@ $<
26+
$(CC) -fPIC -c -g -o $@ $<
2527

2628
.s.o:
2729
nasm -g -f $(format) -o $@ $<

langs/fraud/Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@ UNAME := $(shell uname)
22

33
ifeq ($(UNAME), Darwin)
44
format=macho64
5+
CC=arch -x86_64 gcc
56
else
67
format=elf64
8+
CC=gcc
79
endif
810

911
objs = \
@@ -18,10 +20,10 @@ runtime.o: $(objs)
1820
ld -r $(objs) -o runtime.o
1921

2022
%.run: %.o runtime.o
21-
arch -x86_64 gcc runtime.o $< -o $@
23+
$(CC) runtime.o $< -o $@
2224

2325
.c.o:
24-
arch -x86_64 gcc -fPIC -c -g -o $@ $<
26+
$(CC) -fPIC -c -g -o $@ $<
2527

2628
.s.o:
2729
nasm -g -f $(format) -o $@ $<

langs/hoax/Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@ UNAME := $(shell uname)
22

33
ifeq ($(UNAME), Darwin)
44
format=macho64
5+
CC=arch -x86_64 gcc
56
else
67
format=elf64
8+
CC=gcc
79
endif
810

911
objs = \
@@ -18,10 +20,10 @@ runtime.o: $(objs)
1820
ld -r $(objs) -o runtime.o
1921

2022
%.run: %.o runtime.o
21-
arch -x86_64 gcc runtime.o $< -o $@
23+
$(CC) runtime.o $< -o $@
2224

2325
.c.o:
24-
arch -x86_64 gcc -fPIC -c -g -o $@ $<
26+
$(CC) -fPIC -c -g -o $@ $<
2527

2628
.s.o:
2729
nasm -g -f $(format) -o $@ $<

langs/hustle/Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@ UNAME := $(shell uname)
22

33
ifeq ($(UNAME), Darwin)
44
format=macho64
5+
CC=arch -x86_64 gcc
56
else
67
format=elf64
8+
CC=gcc
79
endif
810

911
objs = \
@@ -18,10 +20,10 @@ runtime.o: $(objs)
1820
ld -r $(objs) -o runtime.o
1921

2022
%.run: %.o runtime.o
21-
arch -x86_64 gcc runtime.o $< -o $@
23+
$(CC) runtime.o $< -o $@
2224

2325
.c.o:
24-
arch -x86_64 gcc -fPIC -c -g -o $@ $<
26+
$(CC) -fPIC -c -g -o $@ $<
2527

2628
.s.o:
2729
nasm -g -f $(format) -o $@ $<

0 commit comments

Comments
 (0)