Changeset 122


Ignore:
Timestamp:
Nov 20, 2006 11:44:07 PM (13 years ago)
Author:
ladanyi
Message:

force the AMPL library build to pick up the value of blrts_xlc

Location:
branches/devel/Bonmin/experimental/Bcp
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/devel/Bonmin/experimental/Bcp/Makefile.am

    r110 r122  
    7676        eval `sed -e "s/ CFLAGS=\".*\"//" aslflags.txt`; \
    7777        eval `sed -e "s/.*CFLAGS=\"\(.*\)\".*/CFLAGS=\"-DNO_FUNCADD \1\"/" aslflags.txt` ; \
    78         $(MAKE) $$ASLMAKEFLAGS CFLAGS="$$CFLAGS" -f makefile.u ; \
     78        if test x"$$CC" = x; then \
     79                CC=cc ; \
     80        fi; \
     81        $(MAKE) CC="$$CC" $$ASLMAKEFLAGS CFLAGS="$$CFLAGS" -f makefile.u ; \
    7982        cp amplsolver.a ..
    8083
  • branches/devel/Bonmin/experimental/Bcp/Makefile.in

    r110 r122  
    685685        eval `sed -e "s/ CFLAGS=\".*\"//" aslflags.txt`; \
    686686        eval `sed -e "s/.*CFLAGS=\"\(.*\)\".*/CFLAGS=\"-DNO_FUNCADD \1\"/" aslflags.txt` ; \
    687         $(MAKE) $$ASLMAKEFLAGS CFLAGS="$$CFLAGS" -f makefile.u ; \
     687        if test x"$$CC" = x; then \
     688                CC=cc ; \
     689        fi; \
     690        $(MAKE) CC="$$CC" $$ASLMAKEFLAGS CFLAGS="$$CFLAGS" -f makefile.u ; \
    688691        cp amplsolver.a ..
    689692# Tell versions [3.59,3.63) of GNU make to not export all variables.
Note: See TracChangeset for help on using the changeset viewer.