Changeset 3691


Ignore:
Timestamp:
2006-04-21T11:56:20+02:00 (11 years ago)
Author:
mbm
Message:

fix more BR2 crap

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/buildroot-ng/openwrt/rules.mk

    r3679 r3691  
    1 ifeq ($(DUMP),) 
    21include $(TOPDIR)/.config 
    3 endif 
    42 
    53SHELL=/bin/bash 
     
    4442CP=cp -fpR 
    4543MAKE1=make 
    46 MAKEFLAGS=-j$(BR2_JLEVEL) V=$(V) $(EXTRA_MAKEFLAGS) 
     44MAKEFLAGS=-j$(CONFIG_JLEVEL) V=$(V) $(EXTRA_MAKEFLAGS) 
    4745# Strip off the annoying quoting 
    48 ARCH:=$(strip $(subst ",, $(BR2_ARCH))) 
    49 WGET:=$(strip $(subst ",, $(BR2_WGET))) 
    50 GCC_VERSION:=$(strip $(subst ",, $(BR2_GCC_VERSION))) 
    51 GCC_USE_SJLJ_EXCEPTIONS:=$(strip $(subst ",, $(BR2_GCC_USE_SJLJ_EXCEPTIONS))) 
    52 TARGET_OPTIMIZATION:=$(strip $(subst ",, $(BR2_TARGET_OPTIMIZATION))) 
     46ARCH:=$(strip $(subst ",, $(CONFIG_ARCH))) 
     47WGET:=$(strip $(subst ",, $(CONFIG_WGET))) 
     48GCC_VERSION:=$(strip $(subst ",, $(CONFIG_GCC_VERSION))) 
     49GCC_USE_SJLJ_EXCEPTIONS:=$(strip $(subst ",, $(CONFIG_GCC_USE_SJLJ_EXCEPTIONS))) 
     50TARGET_OPTIMIZATION:=$(strip $(subst ",, $(CONFIG_TARGET_OPTIMIZATION))) 
    5351#"))"))"))"))")) # for vim's broken syntax highlighting :) 
    5452 
    5553 
    56 ifeq ($(BR2_SOFT_FLOAT),y) 
     54ifeq ($(CONFIG_SOFT_FLOAT),y) 
    5755# gcc 3.4.x soft float configuration is different than previous versions. 
    5856ifeq ($(findstring 3.4.,$(GCC_VERSION)),3.4.) 
     
    7068 
    7169 
    72 ifeq ($(BR2_TAR_VERBOSITY),y) 
     70ifeq ($(CONFIG_TAR_VERBOSITY),y) 
    7371TAR_OPTIONS=-xvf 
    7472else 
     
    7674endif 
    7775 
    78 ifneq ($(BR2_LARGEFILE),y) 
     76ifneq ($(CONFIG_LARGEFILE),y) 
    7977DISABLE_LARGEFILE= --disable-largefile 
    8078endif 
     
    137135endif 
    138136 
    139 ifeq ($(BR2_ENABLE_MULTILIB),y) 
     137ifeq ($(CONFIG_ENABLE_MULTILIB),y) 
    140138MULTILIB:=--enable-multilib 
    141139endif 
Note: See TracChangeset for help on using the changeset viewer.