[SCM] Lisaac compiler branch, master, updated. lisaac-0.12-453-gfd2f9c4
Jeremy Cowgar
jeremy at cowgar.com
Tue Aug 25 03:04:12 UTC 2009
The following commit has been merged in the master branch:
commit fd2f9c4db679528edb64575fb5025c36c6fb0be3
Merge: 65566095e081669f572ff070a5f89fa5bd643a4f fea7cd412cd16705d6f354afb59156ef6c2630e6
Author: Jeremy Cowgar <jeremy at cowgar.com>
Date: Mon Aug 24 23:03:21 2009 -0400
Merge branch 'master' of ssh://jeremy-guest@git.debian.org/git/lisaac/compiler
diff --combined make.lip
index 5803e0a,86f7de5..64658a0
--- a/make.lip
+++ b/make.lip
@@@ -122,27 -122,15 +122,27 @@@ Section Privat
- add_lib lib:STRING <-
(
- run "echo \"int main(){ return(1); }\" > __tmp__.c";
- (run ("gcc __tmp__.c -o __tmp__ " + lib + " 2> /dev/null") = 0).if {
- lib_gcc := lib_gcc + " " + lib;
- run "rm __tmp__.c __tmp__";
+ (target = "windows").if {
+ run "echo int main(){ return(1); } > __tmp__.c";
+ (run ("gcc __tmp__.c -o __tmp__ " + lib + " > NUL") = 0).if {
+ lib_gcc := lib_gcc + " " + lib;
+ run "del __tmp__.c __tmp__.exe";
+ } else {
+ "\nERROR: `" + lib + "' library for GCC not found.\n".print;
+ run "del __tmp__.c";
+ exit;
+ };
} else {
- "\nERROR: `" + lib + "' library for GCC not found.\n".print;
- run "rm __tmp__.c";
- exit;
- };
+ run "echo \"int main(){ return(1); }\" > __tmp__.c";
+ (run ("gcc __tmp__.c -o __tmp__ " + lib + " 2> /dev/null") = 0).if {
+ lib_gcc := lib_gcc + " " + lib;
+ run "rm __tmp__.c __tmp__";
+ } else {
+ "\nERROR: `" + lib + "' library for GCC not found.\n".print;
+ run "rm __tmp__.c";
+ exit;
+ };
+ };
);
- execute cmd:STRING <-
@@@ -191,7 -179,7 +191,7 @@@
(is_cop).if {
lib_gcc := lib_gcc + " -lpthread";
};
- execute ("gcc " + input_file + ".c -o " + input_file + " -lm -lX11 " + option_gcc + lib_gcc);
+ execute ("gcc " + input_file + ".c -o " + input_file + " -lm " + option_gcc + lib_gcc);
};
);
--
Lisaac compiler
More information about the Lisaac-commits
mailing list