Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
# Works on Linux, macOS, and Windows
# ============================================================

# Define target executable (must be defined before config.mk is included)
BIN := luma

# Include default config
include config.default.mk

Expand All @@ -15,8 +18,6 @@ endif
# Paths & Files
# ------------------------------------------------------------

BIN := luma

# Detect OS and set appropriate commands
ifeq ($(OS),Windows_NT)
# Windows commands
Expand Down Expand Up @@ -152,4 +153,4 @@ help:
@echo run-llvm - Run generated bitcode with lli
@echo compile-native - Compile LLVM IR to native executable
@echo clean - Remove all build artifacts
@echo help - Show this help
@echo help - Show this help
2 changes: 1 addition & 1 deletion config.mk.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CC = @CXX@
CC = @CC@
CFLAGS += @CXXFLAGS@
LDFLAGS += @LDFLAGS@
PREFIX = @prefix@
Expand Down
6 changes: 3 additions & 3 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ AC_PREREQ([2.69])
AC_CONFIG_SRCDIR([src/main.c]) # sanity check to make sure someone didn't pass a garbage --srcdir
#AM_INIT_AUTOMAKE([foreign 1.16 dist-bzip2])

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

Expand Down