Skip to content

Commit

Permalink
Merge pull request #316 from dkgroot/fix_make
Browse files Browse the repository at this point in the history
[Trivial] Update tools:posix.mak
merged-on-behalf-of: Sebastian Wilzbach <sebi.wilzbach@gmail.com>
  • Loading branch information
dlang-bot committed Feb 22, 2018
2 parents 7df2819 + 140a4c8 commit 807671e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
1 change: 0 additions & 1 deletion dget.d
Expand Up @@ -7,7 +7,6 @@ module dget;

import std.algorithm, std.exception, std.file, std.range, std.net.curl;
static import std.stdio;
pragma(lib, "curl");

void usage()
{
Expand Down
9 changes: 5 additions & 4 deletions posix.mak
@@ -1,5 +1,6 @@
DMD_DIR = ../dmd
DMD = $(DMD_DIR)/generated/$(OS)/release/$(MODEL)/dmd
BUILD = release
DMD = $(DMD_DIR)/generated/$(OS)/$(BUILD)/$(MODEL)/dmd
CC = gcc
INSTALL_DIR = ../install
DRUNTIME_PATH = ../druntime
Expand Down Expand Up @@ -35,15 +36,15 @@ endif

# Set PHOBOS name and full path
ifeq (,$(findstring win,$(OS)))
PHOBOS = $(PHOBOS_PATH)/generated/$(OS)/release/$(MODEL)/libphobos2.a
PHOBOSSO = $(PHOBOS_PATH)/generated/$(OS)/release/$(MODEL)/libphobos2.so
PHOBOS = $(PHOBOS_PATH)/generated/$(OS)/$(BUILD)/$(MODEL)/libphobos2.a
PHOBOSSO = $(PHOBOS_PATH)/generated/$(OS)/$(BUILD)/$(MODEL)/libphobos2.so
endif

# default to warnings and deprecations as errors, override via e.g. make -f posix.mak WARNINGS=-wi
WARNINGS = -w -de
# default include/link paths, override by setting DFLAGS (e.g. make -f posix.mak DFLAGS=-I/foo)
DFLAGS = -I$(DRUNTIME_PATH)/import -I$(PHOBOS_PATH) \
-L-L$(PHOBOS_PATH)/generated/$(OS)/release/$(MODEL) $(MODEL_FLAG) -fPIC
-L-L$(PHOBOS_PATH)/generated/$(OS)/$(BUILD)/$(MODEL) $(MODEL_FLAG) -fPIC
DFLAGS += $(WARNINGS)

# Default DUB flags (DUB uses a different architecture format)
Expand Down

0 comments on commit 807671e

Please sign in to comment.