diff options
| author | Rickard Green <[email protected]> | 2010-08-10 13:42:42 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2010-08-10 13:42:42 +0200 |
| commit | 59ee2a593090e7d53c97ceba63cbd300d1b9657e (patch) | |
| tree | b60c1078eebb64955bba181cfc118ee2f3b845d4 /lib/tools/c_src/Makefile.in | |
| parent | 0d553b45b5c3ae8287340887f271bc70f1f1370c (diff) | |
| parent | 300b419486c1ca88e33938f182d5d5a8b90fb73f (diff) | |
| download | otp-59ee2a593090e7d53c97ceba63cbd300d1b9657e.tar.gz otp-59ee2a593090e7d53c97ceba63cbd300d1b9657e.tar.bz2 otp-59ee2a593090e7d53c97ceba63cbd300d1b9657e.zip | |
Merge branch 'rickard/ethread-rewrite/OTP-8544' into dev
* rickard/ethread-rewrite/OTP-8544:
Rewrite ethread library
Diffstat (limited to 'lib/tools/c_src/Makefile.in')
| -rw-r--r-- | lib/tools/c_src/Makefile.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/tools/c_src/Makefile.in b/lib/tools/c_src/Makefile.in index e6b76e2238..65a7f5f424 100644 --- a/lib/tools/c_src/Makefile.in +++ b/lib/tools/c_src/Makefile.in @@ -128,12 +128,13 @@ EMEM_ERTS_LIB=erts_r$(TYPEMARKER) endif +EMEM_ETHR_LIBS=$(subst -l$(ETHR_LIB_NAME),-l$(ETHR_LIB_NAME)$(TYPEMARKER),$(subst -lerts_internal_r,-lerts_internal_r$(TYPEMARKER),$(ETHR_LIBS))) + EMEM_LIBS = $(LIBS) \ -L$(ERL_TOP)/erts/lib/$(TARGET) \ -L$(ERL_TOP)/erts/lib/internal/$(TARGET) \ -l$(EMEM_ERTS_LIB) \ - -l$(ETHR_LIB_NAME)$(TYPEMARKER) \ - $(ETHR_X_LIBS) + $(EMEM_ETHR_LIBS) EMEM_OBJS = $(addprefix $(EMEM_OBJ_DIR)/,$(notdir $(EMEM_SRCS:.c=.o))) |