Changeset 12585 in project


Ignore:
Timestamp:
11/24/08 13:18:36 (11 years ago)
Author:
felix winkelmann
Message:

variable holding linker options was named incorrectly (problem reported by Peter Bex)

Location:
chicken/trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • chicken/trunk/Makefile.bsd

    r12301 r12585  
    4141endif
    4242LINKER_LINK_SHARED_LIBRARY_OPTIONS = -shared
    43 LINKER_LINK_DLOADABLE_OPTIONS = -shared -Wl,-R$(RUNTIME_LINKER_PATH) -Wl,-L.
     43LINKER_LINK_SHARED_DLOADABLE_OPTIONS = -shared -Wl,-R$(RUNTIME_LINKER_PATH) -Wl,-L.
    4444LINKER_LINK_SHARED_PROGRAM_OPTIONS = -Wl,-R$(RUNTIME_LINKER_PATH)
    4545LIBRARIES = -lm
  • chicken/trunk/Makefile.macosx

    r12021 r12585  
    4747POSTINSTALL_PROGRAM_FLAGS = -change libchicken$(SO) $(LIBDIR)/libchicken$(SO)
    4848LIBRARIAN_OPTIONS = scru
    49 LINKER_LINK_DLOADABLE_OPTIONS = -bundle -L.
     49LINKER_LINK_SHARED_DLOADABLE_OPTIONS = -bundle -L.
    5050
    5151# file extensions
  • chicken/trunk/Makefile.msvc

    r12021 r12585  
    9494LINKER_LIBRARY_SUFFIX = .lib
    9595LINKER_LINK_SHARED_LIBRARY_OPTIONS = -dll
    96 LINKER_LINK_DLOADABLE_OPTIONS = -dll
     96LINKER_LINK_SHARED_DLOADABLE_OPTIONS = -dll
    9797
    9898PROGRAM_IMPORT_LIBRARIES = chicken.lib csi.lib csc.lib chicken-setup.lib chicken-profile.lib chicken-bug.lib
  • chicken/trunk/Makefile.solaris

    r12301 r12585  
    4141endif
    4242LINKER_LINK_SHARED_LIBRARY_OPTIONS = -shared
    43 LINKER_LINK_DLOADABLE_OPTIONS = -shared -Wl,-R$(RUNTIME_LINKER_PATH) -Wl,-L.
     43LINKER_LINK_SHARED_DLOADABLE_OPTIONS = -shared -Wl,-R$(RUNTIME_LINKER_PATH) -Wl,-L.
    4444LINKER_LINK_SHARED_PROGRAM_OPTIONS = -Wl,-R$(RUNTIME_LINKER_PATH)
    4545LIBRARIES = -lrt -lsocket -lnsl -lm -ldl
  • chicken/trunk/defaults.make

    r12584 r12585  
    201201endif
    202202LINKER_LINK_SHARED_LIBRARY_OPTIONS ?= -shared
    203 LINKER_LINK_DLOADABLE_OPTIONS ?= -shared -L.
     203LINKER_LINK_SHARED_DLOADABLE_OPTIONS ?= -shared -L.
    204204LIBRARIAN_OPTIONS ?= cru
    205205LIBRARIAN_OUTPUT_OPTION ?=
     
    213213REMOVE_COMMAND_OPTIONS ?= -f
    214214REMOVE_COMMAND_RECURSIVE_OPTIONS ?= -fr
    215 MAKE_WRITABLE_COMMAND ?= chmod 0644
     215MAKE_WRITABLE_COMMAND ?= chmod 0744
    216216endif
    217217MAKEINFO_PROGRAM_OPTIONS ?= --no-split
     
    259259HOST_LINKER ?= $(LINKER)
    260260HOST_LINKER_OPTIONS ?= $(LINKER_OPTIONS)
    261 HOST_LINKER_LINK_DLOADABLE_OPTIONS ?= $(LINKER_LINK_DLOADABLE_OPTIONS)
     261HOST_LINKER_LINK_SHARED_DLOADABLE_OPTIONS ?= $(LINKER_LINK_SHARED_DLOADABLE_OPTIONS)
    262262HOST_LINKER_OUTPUT_OPTION ?= $(LINKER_OUTPUT_OPTION)
    263263HOST_LINKER_LIBRARY_PREFIX ?= $(LINKER_LIBRARY_PREFIX)
  • chicken/trunk/rules.make

    r12559 r12585  
    866866
    867867%.so: %.o
    868         $(HOST_LINKER) $(HOST_LINKER_OPTIONS) $(HOST_LINKER_LINK_DLOADABLE_OPTIONS) $^ $(HOST_LINKER_OUTPUT_OPTION) $@ \
     868        $(HOST_LINKER) $(HOST_LINKER_OPTIONS) $(HOST_LINKER_LINK_SHARED_DLOADABLE_OPTIONS) $^ $(HOST_LINKER_OUTPUT_OPTION) $@ \
    869869          $(HOST_LINKER_LIBRARY_PREFIX)chicken$(HOST_LINKER_LIBRARY_SUFFIX) \
    870870          $(HOST_LIBRARIES)
     
    999999          $(CSI_PROGRAM)$(EXE) $(CSC_PROGRAM)$(EXE) $(CHICKEN_PROFILE_PROGRAM)$(EXE) \
    10001000          $(CHICKEN_INSTALL_PROGRAM)$(EXE) $(CHICKEN_UNINSTALL_PROGRAM)$(EXE) \
    1001           $(CHICKEN_STATUS_PROGRAM)$(EXE)
     1001          $(CHICKEN_STATUS_PROGRAM)$(EXE) $(IMPORT_LIBRARIES:%=%.import.so)
    10021002        $(MAKE) -f $(SRCDIR)Makefile.$(PLATFORM) NEEDS_RELINKING=no RUNTIME_LINKER_PATH=$(LIBDIR) install
    10031003        $(MAKE_WRITABLE_COMMAND) $(CHICKEN_PROGRAM)$(EXE) $(CSI_PROGRAM)$(EXE) \
Note: See TracChangeset for help on using the changeset viewer.