Merge pull request #94 from yuyan-lang/continue_to_compilation

修复之前的Merge Conflict
yuyan-lang · Feb 6, 2024 · 983e58f · 983e58f
2 parents c978dbc + f27ecff
commit 983e58f
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/运行时支持库/Makefile b/运行时支持库/Makefile
@@ -44,13 +44,8 @@ debug: libyyrtdebug$(VERSION).a
 
 libyyrtopt$(VERSION).a: $(NATIVE_SOURCES)
 	@mkdir -p build/native
-<<<<<<< HEAD
 	cd build/native && $(CC) -DNDEBUG -flto -c -g -O3 $(NATIVE_SCFILES) -I /usr/local/include $(ADDITIONAL_INCLUDE_PATHS) -Werror
 	llvm-ar rcs $@ build/native/*.o
-=======
-	cd build/native && $(CC) -DNDEBUG -c -g -O3 $(NATIVE_SCFILES) -I /usr/local/include $(ADDITIONAL_INCLUDE_PATHS) -Werror
-	ar rcs $@ build/native/*.o
->>>>>>> 08123c6a89f5d3c8468a97218de02ba4f6562d94
 
 opt : libyyrtopt$(VERSION).a