From a4cc23971ff0abf314f17b91733fc1f6704c168e Mon Sep 17 00:00:00 2001 From: Calvin Rose Date: Sun, 3 Mar 2019 18:55:10 -0500 Subject: [PATCH] Only use -rdyanmic at link time Before, we were using -rdynamic as a compiler flag, but it is only needed at link time. This also gets rid of some annoying warnings in clang. --- Makefile | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 3d08650e..9efbacb3 100644 --- a/Makefile +++ b/Makefile @@ -36,16 +36,18 @@ DEBUGGER=gdb CFLAGS=-std=c99 -Wall -Wextra -Isrc/include -fpic -O2 -fvisibility=hidden \ -DJANET_BUILD=$(JANET_BUILD) +LDFLAGS=-rdynamic +# Check OS UNAME:=$(shell uname -s) ifeq ($(UNAME), Darwin) - # Add other macos/clang flags + CLIBS:=$(CLIBS) -ldl +else ifeq ($(UNAME), Linux) + CLIBS:=$(CLIBS) -lrt -ldl +else ifeq ($(UNAME), FreeBSD) CLIBS:=$(CLIBS) -ldl else ifeq ($(UNAME), OpenBSD) - # pass ... -else - CFLAGS:=$(CFLAGS) -rdynamic - CLIBS:=$(CLIBS) -lrt -ldl + CLIBS:=$(CLIBS) -ldl endif $(shell mkdir -p build/core build/mainclient build/webclient build/boot) @@ -95,10 +97,10 @@ build/%.o: src/%.c $(JANET_HEADERS) $(JANET_LOCAL_HEADERS) $(CC) $(CFLAGS) -o $@ -c $< $(JANET_TARGET): $(JANET_CORE_OBJECTS) $(JANET_MAINCLIENT_OBJECTS) - $(CC) $(CFLAGS) -o $@ $^ $(CLIBS) + $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(CLIBS) $(JANET_LIBRARY): $(JANET_CORE_OBJECTS) - $(CC) $(CFLAGS) -shared -o $@ $^ $(CLIBS) + $(CC) $(LDFLAGS) $(CFLAGS) -shared -o $@ $^ $(CLIBS) ###################### ##### Emscripten #####