Skip to content

Commit a4e4e69

Browse files
authored
fix build system (pt 2; electric boogaloo) (#13)
1 parent 625a61c commit a4e4e69

3 files changed

Lines changed: 8 additions & 7 deletions

File tree

Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
# Works on Linux, macOS, and Windows
44
# ============================================================
55

6+
# Define target executable (must be defined before config.mk is included)
7+
BIN := luma
8+
69
# Include default config
710
include config.default.mk
811

@@ -15,8 +18,6 @@ endif
1518
# Paths & Files
1619
# ------------------------------------------------------------
1720

18-
BIN := luma
19-
2021
# Detect OS and set appropriate commands
2122
ifeq ($(OS),Windows_NT)
2223
# Windows commands
@@ -152,4 +153,4 @@ help:
152153
@echo run-llvm - Run generated bitcode with lli
153154
@echo compile-native - Compile LLVM IR to native executable
154155
@echo clean - Remove all build artifacts
155-
@echo help - Show this help
156+
@echo help - Show this help

config.mk.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CC = @CXX@
1+
CC = @CC@
22
CFLAGS += @CXXFLAGS@
33
LDFLAGS += @LDFLAGS@
44
PREFIX = @prefix@

configure.ac

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ AC_PREREQ([2.69])
33
AC_CONFIG_SRCDIR([src/main.c]) # sanity check to make sure someone didn't pass a garbage --srcdir
44
#AM_INIT_AUTOMAKE([foreign 1.16 dist-bzip2])
55

6-
AC_PROG_CXX
7-
AC_LANG(C++)
8-
AC_SUBST(CXX)
6+
AC_PROG_CC
7+
AC_LANG(C)
8+
AC_SUBST(CC)
99
# connor, i have no idea why you're expecting CC to be a C++ compiler.
1010
# that's what CXX is for.
1111

0 commit comments

Comments
 (0)