Changeset 14863


Ignore:
Timestamp:
2009-03-13T17:16:54+01:00 (7 years ago)
Author:
nbd
Message:

fix the target-local CONFIG_SITE export. apparently make can't do more than one of them in a single line

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/package.mk

    r14851 r14863  
    6969  $(call Build/Autoclean) 
    7070 
    71   $(STAMP_PREPARED) : export PATH=$$(TARGET_PATH_PKG) CONFIG_SITE=$$(CONFIG_SITE) 
     71  $(STAMP_PREPARED) : export PATH=$$(TARGET_PATH_PKG) 
    7272  $(STAMP_PREPARED): 
    7373        @-rm -rf $(PKG_BUILD_DIR) 
     
    7878        touch $$@ 
    7979 
    80   $(STAMP_CONFIGURED) : export PATH=$$(TARGET_PATH_PKG) CONFIG_SITE=$$(CONFIG_SITE) 
     80  $(STAMP_CONFIGURED) : export PATH=$$(TARGET_PATH_PKG) 
     81  $(STAMP_CONFIGURED) : export CONFIG_SITE:=$$(CONFIG_SITE) 
    8182  $(STAMP_CONFIGURED): $(STAMP_PREPARED) $(HOST_STAMP_INSTALLED) 
    8283        $(foreach hook,$(Hooks/Configure/Pre),$(call $(hook))$(sep)) 
     
    8586        touch $$@ 
    8687 
    87   $(STAMP_BUILT) : export PATH=$$(TARGET_PATH_PKG) CONFIG_SITE=$$(CONFIG_SITE) 
     88  $(STAMP_BUILT) : export PATH=$$(TARGET_PATH_PKG) 
     89  $(STAMP_BUILT) : export CONFIG_SITE:=$$(CONFIG_SITE) 
    8890  $(STAMP_BUILT): $(STAMP_CONFIGURED) 
    8991        $(foreach hook,$(Hooks/Compile/Pre),$(call $(hook))$(sep)) 
     
    9496        touch $$@ 
    9597 
    96   $(STAMP_INSTALLED) : export PATH=$$(TARGET_PATH_PKG) CONFIG_SITE=$$(CONFIG_SITE) 
     98  $(STAMP_INSTALLED) : export PATH=$$(TARGET_PATH_PKG) 
    9799  $(STAMP_INSTALLED): $(STAMP_BUILT) 
    98100        $(SUBMAKE) -j1 clean-staging 
Note: See TracChangeset for help on using the changeset viewer.