Ticket #42886: patch-admin-Makefile.def.diff
File patch-admin-Makefile.def.diff, 1.1 KB (added by smaret (Sebastien Maret), 11 years ago) |
---|
-
admin/Makefile.def
old new 231 231 # Fortran preprocessing 232 232 233 233 # Preprocessor command 234 CPP = cpp234 CPP = @CPP@ 235 235 ifeq ($(GAG_OS_KIND),solaris) 236 236 CPP = /usr/ccs/lib/cpp 237 237 endif … … 309 309 # C compilation 310 310 311 311 # C compiler name 312 CC = gcc313 CXX = g++312 CC = @CC@ 313 CXX = @CXX@ 314 314 ifeq ($(GAG_OS_KIND),aix) 315 315 CC = xlc 316 316 endif … … 333 333 endif 334 334 335 335 # GCC flags 336 ifeq ($(CC), gcc)336 ifeq ($(CC),@CC@) 337 337 # Generic to GCC 338 338 GLOBAL_CFLAGS += -pipe -fPIC 339 339 OPTION_CFLAGS += -Wall … … 512 512 # Compilation in 32 bits mode 513 513 GAG_32BITS_SWITCH = "-m32" 514 514 endif 515 STDCpp_LIB += $(shell g++ $(GAG_32BITS_SWITCH) -print-file-name=libstdc++.$(LIB_CPP_EXT))515 STDCpp_LIB += /usr/lib/libc++.dylib 516 516 517 517 ########################################################################### 518 518 # Kernel libraries 519 519 520 LEGACY_LIBS = -lslatec -l lapack -lblas520 LEGACY_LIBS = -lslatec -lLAPACK -lBLAS 521 521 _GAG_LIBS = -lggui -lgcore -lgio -lgwcs -lgmath -lgsys -lginc 522 522 ifndef GAG_WIN32 523 523 GAG_LIBS = $(_GAG_LIBS)