Skip to content

Commit

Permalink
Some small build system fixes
Browse files Browse the repository at this point in the history
- The -mllvm asan-stack stack option is only relevant when compiling, so
  remove it from the link flags.
- ui/Makefile was including CFLAGS twice. Remove one of them.
- -ltinfo does not exist on some linux distributions. Remove it and let's revisit that
  when it's needed for 3.4
  • Loading branch information
Keno committed Dec 15, 2013
1 parent bb54883 commit 214c87f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Make.inc
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ endif
ifeq ($(SANITIZE),1)
JCXXFLAGS += -fsanitize=address -mllvm -asan-stack=0
JCFLAGS += -fsanitize=address -mllvm -asan-stack=0
LDFLAGS += -fsanitize=address -mllvm -asan-stack=0
LDFLAGS += -fsanitize=address
endif

# ===========================================================================
Expand Down Expand Up @@ -398,7 +398,7 @@ else
endif

ifeq ($(OS), Linux)
OSLIBS += -ldl -ltinfo -lrt -lpthread -Wl,--export-dynamic -Wl,--version-script=$(JULIAHOME)/src/julia.expmap -Wl,--no-whole-archive $(LIBUNWIND)
OSLIBS += -ldl -lrt -lpthread -Wl,--export-dynamic -Wl,--version-script=$(JULIAHOME)/src/julia.expmap -Wl,--no-whole-archive $(LIBUNWIND)
JLDFLAGS = -Wl,-Bdynamic
endif

Expand Down
2 changes: 1 addition & 1 deletion ui/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ override CFLAGS += $(JCFLAGS)
override CXXFLAGS += $(JCXXFLAGS)

FLAGS = -Wall -Wno-strict-aliasing -fno-omit-frame-pointer \
-I$(JULIAHOME)/src -I$(JULIAHOME)/src/support -I$(BUILD)/include $(CFLAGS)
-I$(JULIAHOME)/src -I$(JULIAHOME)/src/support -I$(BUILD)/include

DEBUGFLAGS += $(FLAGS)
SHIPFLAGS += $(FLAGS)
Expand Down

0 comments on commit 214c87f

Please sign in to comment.