Changeset 7228 in project


Ignore:
Timestamp:
12/30/07 22:45:39 (12 years ago)
Author:
felix winkelmann
Message:

csc invokes install_name_tool on OS X; installation of import lib for libchickengui was missing

Location:
chicken/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • chicken/trunk/csc.scm

    r7180 r7228  
    816816
    817817(define (run-linking)
    818   (let ([files (map cleanup-filename
     818  (let ((files (map cleanup-filename
    819819                    (append object-files
    820                             (nth-value 0 (static-extension-info)) ) ) ] )
     820                            (nth-value 0 (static-extension-info)) ) ) )
     821        (target (cleanup-filename target-filename)))
    821822    (unless (zero?
    822823             ($system
     
    826827                      (append
    827828                       files
    828                        (list (string-append link-output-flag (cleanup-filename target-filename))
     829                       (list (string-append link-output-flag target)
    829830                             (linker-options)
    830831                             (linker-libraries #f) ) ) ) ) ) )
    831832      (exit last-exit-code) )
     833    (when (and osx (not host-mode))
     834      (unless (zero? ($system
     835                      (string-append
     836                       "install_name_tool -change libchicken.dylib "
     837                       (quotewrap
     838                        (make-pathname
     839                         (prefix "" "lib"
     840                                 (if host-mode
     841                                     INSTALL_LIB_HOME
     842                                     TARGET_RUN_LIB_HOME))
     843                         "libchicken.dylib") )
     844                       " "
     845                       target) ) )
     846        (exit last-exit-code) ) )
    832847    (unless keep-files (for-each $delete-file generated-object-files)) ) )
    833848
  • chicken/trunk/rules.make

    r7215 r7228  
    740740        $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_STATIC_LIBRARY_OPTIONS) $(LIBCHICKEN_IMPORT_LIBRARY) $(DESTDIR)$(ILIBDIR)
    741741        $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_STATIC_LIBRARY_OPTIONS) $(LIBUCHICKEN_IMPORT_LIBRARY) $(DESTDIR)$(ILIBDIR)
     742ifdef WINDOWS
     743        $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_STATIC_LIBRARY_OPTIONS) $(LIBCHICKENGUI_IMPORT_LIBRARY) $(DESTDIR)$(ILIBDIR)
     744endif
    742745endif
    743746ifneq ($(POSTINSTALL_STATIC_LIBRARY),true)
Note: See TracChangeset for help on using the changeset viewer.