diff options
| author | Patrik Nyblom <[email protected]> | 2012-08-20 15:39:46 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2012-08-20 15:39:46 +0200 |
| commit | cca575e1da4736d4e57a1bcafc492415d60b8c23 (patch) | |
| tree | 08f0b53619438a26a72be8f278db5044dc7b5d8b /erts/etc/common/Makefile.in | |
| parent | f11a10e75d7f3b49a58ac225d624ac6654e23870 (diff) | |
| parent | 70b17a5ccb8204df1fbbf04d8232492267dd7533 (diff) | |
| download | otp-cca575e1da4736d4e57a1bcafc492415d60b8c23.tar.gz otp-cca575e1da4736d4e57a1bcafc492415d60b8c23.tar.bz2 otp-cca575e1da4736d4e57a1bcafc492415d60b8c23.zip | |
Merge branch 'pan/heart_and_times/OTP-10111' into maint
* pan/heart_and_times/OTP-10111:
Make heart use clock_gettime when available
Diffstat (limited to 'erts/etc/common/Makefile.in')
| -rw-r--r-- | erts/etc/common/Makefile.in | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in index b10f5d9a87..83fe97df8e 100644 --- a/erts/etc/common/Makefile.in +++ b/erts/etc/common/Makefile.in @@ -64,6 +64,9 @@ LD = @LD@ LIBS = @LIBS@ LDFLAGS = @LDFLAGS@ +# For clock_gettime in heart +RTLIBS = @LIBRT@ + ifeq ($(TARGET),win32) ifeq ($(TYPE),debug) CFLAGS = $(subst -O2,-g,@CFLAGS@ @DEFS@ $(TYPE_FLAGS) @WFLAGS@ -I$(SYSDIR) \ @@ -416,7 +419,7 @@ else $(BINDIR)/heart@EXEEXT@: $(OBJDIR)/heart.o $(ENTRY_OBJ) $(LD) $(LDFLAGS) $(ENTRY_LDFLAGS) -o $@ $(OBJDIR)/heart.o \ - $(ENTRY_OBJ) $(WINDSOCK) + $(RTLIBS) $(ENTRY_OBJ) $(WINDSOCK) $(OBJDIR)/heart.o: heart.c $(RC_GENERATED) $(CC) $(CFLAGS) -o $@ -c heart.c |