diff options
| -rw-r--r-- | ghc.mk | 2 | ||||
| -rw-r--r-- | rts/ghc.mk | 4 | ||||
| -rw-r--r-- | rules/build-package-way.mk | 4 |
3 files changed, 5 insertions, 5 deletions
@@ -229,7 +229,7 @@ endif ifeq "$(GhcDebugged)" "YES" WINDOWS_DYN_PROG_RTS := $(WINDOWS_DYN_PROG_RTS)_debug endif -WINDOWS_DYN_PROG_RTS := $(WINDOWS_DYN_PROG_RTS)_dyn_LIB_NAME +WINDOWS_DYN_PROG_RTS := $(WINDOWS_DYN_PROG_RTS)_dyn_LIB_FILE # ----------------------------------------------------------------------------- # Compilation Flags diff --git a/rts/ghc.mk b/rts/ghc.mk index 787f67a12d..7fa36b6f17 100644 --- a/rts/ghc.mk +++ b/rts/ghc.mk @@ -153,8 +153,8 @@ $(call distdir-way-opts,rts,dist,$1) $(call c-suffix-rules,rts,dist,$1,YES) $(call cmm-suffix-rules,rts,dist,$1) -rts_$1_LIB_NAME = libHSrts$$($1_libsuf) -rts_$1_LIB = rts/dist/build/$$(rts_$1_LIB_NAME) +rts_$1_LIB_FILE = libHSrts$$($1_libsuf) +rts_$1_LIB = rts/dist/build/$$(rts_$1_LIB_FILE) rts_$1_C_OBJS = $$(patsubst rts/%.c,rts/dist/build/%.$$($1_osuf),$$(rts_C_SRCS)) $$(patsubst %.c,%.$$($1_osuf),$$(rts_$1_EXTRA_C_SRCS)) rts_$1_S_OBJS = $$(patsubst rts/%.S,rts/dist/build/%.$$($1_osuf),$$(rts_S_SRCS)) diff --git a/rules/build-package-way.mk b/rules/build-package-way.mk index 27da099542..cb8440d34c 100644 --- a/rules/build-package-way.mk +++ b/rules/build-package-way.mk @@ -23,8 +23,8 @@ $(call hs-objs,$1,$2,$3) # The .a/.so library file, indexed by two different sets of vars: # the first is indexed by the dir, distdir and way # the second is indexed by the package id, distdir and way -$1_$2_$3_LIB_NAME = libHS$$($1_$2_LIB_NAME)$$($3_libsuf) -$1_$2_$3_LIB = $1/$2/build/$$($1_$2_$3_LIB_NAME) +$1_$2_$3_LIB_FILE = libHS$$($1_$2_LIB_NAME)$$($3_libsuf) +$1_$2_$3_LIB = $1/$2/build/$$($1_$2_$3_LIB_FILE) $$($1_$2_PACKAGE_KEY)_$2_$3_LIB = $$($1_$2_$3_LIB) ifeq "$$(HostOS_CPP)" "mingw32" |