Skip to content
This repository has been archived by the owner on Oct 12, 2022. It is now read-only.

Commit

Permalink
enable .so unittests for linux32
Browse files Browse the repository at this point in the history
- also remove SHARED flag
  • Loading branch information
MartinNowak committed Apr 10, 2013
1 parent ee56645 commit a9100f8
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions posix.mak
Expand Up @@ -35,13 +35,7 @@ DOCDIR=doc
IMPDIR=import

MODEL=32
# default to SHARED on some platforms
ifeq (linux,$(OS))
ifeq (64,$(MODEL))
SHARED:=1
endif
endif
override PIC:=$(if $(or $(PIC), $(SHARED)),-fPIC,)
override PIC:=$(if $(PIC),-fPIC,)

ifeq (osx,$(OS))
DOTDLL:=.dylib
Expand Down Expand Up @@ -183,7 +177,7 @@ endif
$(addprefix $(OBJDIR)/,$(DISABLED_TESTS)) :
@echo $@ - disabled

ifeq (,$(SHARED))
ifneq (linux,$(OS))

$(OBJDIR)/test_runner: $(OBJS) $(SRCS) src/test_runner.d
$(DMD) $(UDFLAGS) -version=druntime_unittest -unittest -of$@ src/test_runner.d $(SRCS) $(OBJS) -debuglib= -defaultlib=
Expand All @@ -192,6 +186,7 @@ else

UT_DRUNTIME:=$(OBJDIR)/lib$(DRUNTIME_BASE)-ut$(DOTDLL)

$(UT_DRUNTIME): override PIC:=-fPIC
$(UT_DRUNTIME): $(OBJS) $(SRCS)
$(DMD) $(UDFLAGS) -shared -version=druntime_unittest -unittest -of$@ $(SRCS) $(OBJS) -debuglib= -defaultlib=

Expand Down

0 comments on commit a9100f8

Please sign in to comment.