diff options
| author | rrt <unknown> | 2001-07-16 09:13:39 +0000 |
|---|---|---|
| committer | rrt <unknown> | 2001-07-16 09:13:39 +0000 |
| commit | aa6ee0a8e05fa52c45160ee3292de8f9f4fca70c (patch) | |
| tree | bcfd31841d2894de6b30a0d66bce2288ed9cb9ee | |
| parent | 765dc1a08c7f74dd4ba835501d8f1880c8881ff4 (diff) | |
| download | haskell-aa6ee0a8e05fa52c45160ee3292de8f9f4fca70c.tar.gz | |
[project @ 2001-07-16 09:13:39 by rrt]
Fix DLL building, and add support for linking .hsc.o files into cbits libraries
| -rw-r--r-- | mk/target.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mk/target.mk b/mk/target.mk index 5e8d60f060..51fdbe5cf7 100644 --- a/mk/target.mk +++ b/mk/target.mk @@ -352,6 +352,8 @@ _cbits := _cbits STUBOBJS += $(HSC_C_OBJS) # Add _hsc.c files to the cbits library SRCS += $(wildcard ../*_hsc.c) +# Make .hsc.h include files from the directory above visible +SRC_CC_OPTS += -I.. endif LIBRARY = libHS$(PACKAGE)$(_cbits)$(_way).a @@ -525,6 +527,8 @@ ifeq "$(DLLized)" "YES" ifneq "$(PACKAGE)" "" SRC_BLD_DLL_OPTS += --export-all --output-def=HS$(PACKAGE)$(_cbits)$(_way).def DllVersionInfo.$(way_)o + +ifneq "$(PACKAGE) $(IS_CBITS_LIB)" "std YES" ifneq "$(PACKAGE)" "rts" SRC_BLD_DLL_OPTS += -lHSstd_cbits_imp -L$(GHC_LIB_DIR)/std/cbits SRC_BLD_DLL_OPTS += -lHSrts_$(way_)imp -L$(GHC_RUNTIME_DIR) @@ -534,6 +538,8 @@ ifneq "$(PACKAGE)" "std" endif endif endif +endif + SRC_BLD_DLL_OPTS += -lgmp -L. -L$(GHC_RUNTIME_DIR)/gmp ifeq "$(IS_CBITS_LIB)" "" SRC_BLD_DLL_OPTS += $(patsubst %,-lHS%_$(way_)imp, $(PACKAGE_DEPS)) |