Changeset 32928


Ignore:
Timestamp:
2012-08-01T14:01:18+02:00 (6 years ago)
Author:
florian
Message:

[package] uclibc++: stage g++-uc wrappers in $(TOOLCHAIN_DIR)

Since we are overriding TARGET_CXX with the g++-uc wrapper when
we use cmake it expects to find g++-uc in the TOOLCHAIN_DIR.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/uclibc++/Makefile

    r32421 r32928  
    7171define Build/InstallDev 
    7272        $(INSTALL_DIR) $(2)/bin $(1)/usr/include/uClibc++ $(1)/usr/lib 
    73         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/g++-uc $(2)/bin/ 
     73        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/g++-uc $(TOOLCHAIN_DIR)/bin/ 
    7474        $(CP) $(PKG_INSTALL_DIR)/include/* $(1)/usr/include/uClibc++/ 
    7575        $(CP) $(PKG_INSTALL_DIR)/lib/libuClibc++*.{a,so}* $(1)/usr/lib/ 
    76         $(SED) 's|-I/include/|-I$(STAGING_DIR)/usr/include/uClibc++/|g' $(2)/bin/g++-uc 
    77         $(SED) 's|-L/lib/|-L$(STAGING_DIR)/usr/lib/|g' $(2)/bin/g++-uc 
     76        $(SED) 's|-I/include/|-I$(STAGING_DIR)/usr/include/uClibc++/|g' $(TOOLCHAIN_DIR)/bin/g++-uc 
     77        $(SED) 's|-L/lib/|-L$(STAGING_DIR)/usr/lib/|g' $(TOOLCHAIN_DIR)/bin/g++-uc 
    7878# add another wrapper which links against both uClibc++ and libstdc++  
    79         $(INSTALL_BIN) $(2)/bin/g++-uc $(2)/bin/g++-uc+std 
    80         $(SED) 's|^WRAPPER_INCLUDEDIR=.*||g' $(2)/bin/g++-uc+std 
    81         $(SED) 's|-luClibc++|-Wl,-Bdynamic,-luClibc++,-Bstatic,-lstdc++,-Bdynamic|g' $(2)/bin/g++-uc+std 
    82         $(SED) 's|-nostdinc++||g' $(2)/bin/g++-uc+std 
     79        $(INSTALL_BIN) $(TOOLCHAIN_DIR)/bin/g++-uc $(TOOLCHAIN_DIR)/bin/g++-uc+std 
     80        $(SED) 's|^WRAPPER_INCLUDEDIR=.*||g' $(TOOLCHAIN_DIR)/bin/g++-uc+std 
     81        $(SED) 's|-luClibc++|-Wl,-Bdynamic,-luClibc++,-Bstatic,-lstdc++,-Bdynamic|g' $(TOOLCHAIN_DIR)/bin/g++-uc+std 
     82        $(SED) 's|-nostdinc++||g' $(TOOLCHAIN_DIR)/bin/g++-uc+std 
    8383endef 
    8484 
Note: See TracChangeset for help on using the changeset viewer.