Changes in driver/cfa.cc [8bdc1c36:13a984c]
- File:
-
- 1 edited
-
driver/cfa.cc (modified) (15 diffs)
Legend:
- Unmodified
- Added
- Removed
-
driver/cfa.cc
r8bdc1c36 r13a984c 10 10 // Created On : Tue Aug 20 13:44:49 2002 11 11 // Last Modified By : Peter A. Buhr 12 // Last Modified On : Fri Aug 10 18:17:58201813 // Update Count : 2 5912 // Last Modified On : Mon Sep 3 16:47:59 2018 13 // Update Count : 275 14 14 // 15 15 … … 43 43 const string suffixes[NumSuffixes] = { "cfa", "hfa", }; 44 44 45 bool suffix( string arg ) {45 bool suffix( string arg, const char * args[], int & nargs ) { 46 46 //std::cerr << arg << std::endl; 47 47 size_t dot = arg.find_last_of( "." ); … … 50 50 string sx = arg.substr( dot + 1 ); 51 51 for ( int i = 0; i < NumSuffixes; i += 1 ) { 52 if ( sx == suffixes[i] ) return true; 52 if ( sx == suffixes[i] ) { 53 args[nargs] = "-x"; 54 nargs += 1; 55 args[nargs] = "c"; 56 nargs += 1; 57 return true; 58 } // if 53 59 } // for 54 60 return false; … … 86 92 string Major( str( CFA_VERSION_MAJOR ) ), Minor( str( CFA_VERSION_MINOR ) ), Patch( str( CFA_VERSION_PATCH ) ); 87 93 88 string installincdir( CFA_INCDIR ); 89 string installlibdir( CFA_LIBDIR ); 90 string srcdriverdir ( TOP_BUILDDIR "driver"); 94 string installincdir( CFA_INCDIR ); // fixed location of include files 95 string installlibdir( CFA_LIBDIR ); // fixed location of cc1 and cfa-cpp commands when installed 96 string srcdriverdir ( TOP_BUILDDIR "driver"); // fixed location of cc1 and cfa-cpp commands when in tree 91 97 92 98 string heading; // banner printed at start of cfa compilation … … 123 129 #ifdef __DEBUG_H__ 124 130 cerr << "CFA:" << endl; 131 for ( int i = 1; i < argc; i += 1 ) { 132 cerr << "argv[" << i << "]:\"" << argv[i] << "\"" << endl; 133 } // for 125 134 #endif // __DEBUG_H__ 126 135 … … 128 137 129 138 for ( int i = 1; i < argc; i += 1 ) { 130 #ifdef __DEBUG_H__131 cerr << "argv[" << i << "]:\"" << argv[i] << "\"" << endl;132 #endif // __DEBUG_H__133 139 arg = argv[i]; // convert to string value 134 #ifdef __DEBUG_H__135 cerr << "arg:\"" << arg << "\"" << endl;136 #endif // __DEBUG_H__137 140 if ( prefix( arg, "-" ) ) { 138 141 // pass through arguments … … 178 181 if ( i == argc ) continue; // next argument available ? 179 182 compiler_path = argv[i]; 180 if ( putenv( (char *)( *new string( string( "__ U_COMPILER__=" ) + argv[i]) ).c_str() ) != 0 ) {183 if ( putenv( (char *)( *new string( string( "__CFA_COMPILER__=" ) + argv[i]) ).c_str() ) != 0 ) { 181 184 cerr << argv[0] << " error, cannot set environment variable." << endl; 182 185 exit( EXIT_FAILURE ); … … 197 200 args[nargs] = argv[i]; // pass the argument along 198 201 nargs += 1; 199 } else if ( arg == "-x" ) {200 xflag = true;201 args[nargs] = argv[i]; // pass the argument along202 nargs += 1;203 i += 1; // advance to argument204 args[nargs] = argv[i]; // pass the argument along205 nargs += 1;206 // args[nargs] = ( *new string( string("-D__GCC_X__=") + argv[i] ) ).c_str(); // add the argument for -x207 // nargs += 1;208 } else if ( prefix( arg, "-x" ) ) {209 xflag = true;210 args[nargs] = argv[i]; // pass the argument along211 nargs += 1;212 // args[nargs] = ( *new string( string("-D__GCC_X__=") + arg.substr(2) ) ).c_str(); // add the argument for -x213 // nargs += 1;214 202 } else if ( arg == "-w" ) { 215 203 args[nargs] = argv[i]; // pass the argument along … … 293 281 } // if 294 282 } else { 295 bool opt = false; 296 if ( ! xflag && suffix( arg ) ) { 283 bool cfa = suffix( arg, args, nargs ); // check suffix 284 args[nargs] = argv[i]; // concatenate file 285 nargs += 1; 286 if ( cfa ) { 297 287 args[nargs] = "-x"; 298 288 nargs += 1; 299 args[nargs] = "c";300 nargs += 1;301 // args[nargs] = ( *new string( string("-D__GCC_X__=c") ) ).c_str(); // add the argument for -x302 // nargs += 1;303 opt = true;304 } // if305 // concatenate other arguments306 args[nargs] = argv[i];307 nargs += 1;308 if ( opt ) {309 args[nargs] = "-x";310 nargs += 1;311 289 args[nargs] = "none"; 312 290 nargs += 1; 313 // args[nargs] = ( *new string( string("-D__GCC_X__=none") ) ).c_str(); // add the argument for -x314 // nargs += 1;315 291 } // if 316 292 nonoptarg = true; … … 319 295 } // for 320 296 297 args[nargs] = "-x"; // turn off language 298 nargs += 1; 299 args[nargs] = "none"; 300 nargs += 1; 301 321 302 #ifdef __x86_64__ 322 303 args[nargs] = "-mcx16"; // allow double-wide CAA … … 341 322 args[nargs] = "-I" CFA_INCDIR; 342 323 nargs += 1; 343 if ( ! noincstd_flag ) { 344 args[nargs] = "-I" CFA_INCDIR " /stdhdr";324 if ( ! noincstd_flag ) { // do not use during build 325 args[nargs] = "-I" CFA_INCDIR "stdhdr"; 345 326 nargs += 1; 346 327 } // if 347 args[nargs] = "-I" CFA_INCDIR " /concurrency";348 nargs += 1; 349 args[nargs] = "-I" CFA_INCDIR " /containers";328 args[nargs] = "-I" CFA_INCDIR "concurrency"; 329 nargs += 1; 330 args[nargs] = "-I" CFA_INCDIR "containers"; 350 331 nargs += 1; 351 332 } else { 352 333 args[nargs] = "-I" TOP_SRCDIR "libcfa/src"; 353 334 nargs += 1; 354 if ( ! noincstd_flag ) { 335 if ( ! noincstd_flag ) { // do not use during build 355 336 args[nargs] = "-I" TOP_SRCDIR "libcfa/src" "/stdhdr"; 356 337 nargs += 1; … … 377 358 } 378 359 379 const char * const arch = m32 ? CFA_32_CPU : (m64 ? CFA_64_CPU : CFA_DEFAULT_CPU); 360 string arch = m32 ? CFA_32_CPU : (m64 ? CFA_64_CPU : CFA_DEFAULT_CPU); 361 if ( ! m32 && ! m64 ) { 362 if ( arch == "x86" ) { 363 args[nargs] = "-m32"; 364 nargs += 1; 365 } else if ( arch == "x64" ) { 366 args[nargs] = "-m64"; 367 nargs += 1; 368 } // if 369 } // if 380 370 const char * config = debug ? "debug": "nodebug"; 381 371 string libdir = libbase + arch + "-" + config; 382 if( !dirExists(libdir) ) { 372 373 if ( ! dirExists( libdir ) ) { 383 374 cerr << argv[0] << " internal error, configuration " << config << " not installed." << endl; 384 375 cerr << "Was looking for " << libdir << endl; 385 376 libdir = libbase + arch + "-" + "nolib"; 386 } 387 388 if ( !dirExists(libdir) ) {377 } // if 378 379 if ( ! dirExists( libdir ) ) { 389 380 cerr << argv[0] << " internal error, cannot find prelude directory." << endl; 390 381 cerr << "Was looking for " << libdir << endl; 391 382 exit( EXIT_FAILURE ); 392 } 383 } // if 393 384 394 385 args[nargs] = ( *new string( string("-D__CFA_FLAG__=--prelude-dir=" ) + libdir + (intree ? "/prelude" : "")) ).c_str(); … … 414 405 415 406 // include the cfa library in case it's needed 416 args[nargs] = ( *new string( string("-L" ) + libdir + (intree ? "/src/.libs" : "")) ).c_str(); 417 nargs += 1; 418 args[nargs] = ( *new string( string("-Wl,-rpath," ) + libdir + (intree ? "/src/.libs" : "")) ).c_str(); 407 args[nargs] = ( *new string( string("-L" ) + libdir + (intree ? "/src" : "")) ).c_str(); 419 408 nargs += 1; 420 409 args[nargs] = "-lcfa"; … … 472 461 473 462 if ( Bprefix.length() == 0 ) { 474 Bprefix = !intree ? installlibdir : srcdriverdir; 463 Bprefix = ! intree ? installlibdir : srcdriverdir; 464 if ( Bprefix[Bprefix.length() - 1] != '/' ) Bprefix += '/'; 475 465 args[nargs] = ( *new string( string("-D__GCC_BPREFIX__=") + Bprefix ) ).c_str(); 476 466 nargs += 1; … … 506 496 args[nargs] = "-D__int8_t_defined"; // prevent gcc type-size attributes 507 497 nargs += 1; 508 args[nargs] = ( *new string( string("-B") + Bprefix + "/") ).c_str();498 args[nargs] = ( *new string( string("-B") + Bprefix ) ).c_str(); 509 499 nargs += 1; 510 500 args[nargs] = "-lm";
Note:
See TracChangeset
for help on using the changeset viewer.
